[edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure

[edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure

[Agyeman, Prince]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2225

Currently, gcc 5 encounters an error "unused-but-set-variable" in
BdsPlatform.c  as a result of a Status variable not being used
after it's set.

This was fixed by printing the Status variable when
EfiBootManagerDeleteLoadOptionVariable function encounters an error

Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Kubacki Michael A <michael.a.kubacki@intel.com>

Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
---
 .../Library/PlatformBootManagerLib/BdsPlatform.c              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 7aa3860f75..a4b010be63 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -348,6 +348,10 @@ PlatformBootManagerBeforeConsole (
   NvBootOptions = EfiBootManagerGetLoadOptions (&NvBootOptionCount, LoadOptionTypeBoot);
   for (Index = 0; Index < NvBootOptionCount; Index++) {
     Status = EfiBootManagerDeleteLoadOptionVariable (NvBootOptions[Index].OptionNumber, LoadOptionTypeBoot);
+    if(EFI_ERROR (Status)){
+      DEBUG ((DEBUG_ERROR,
+          "%a: removing Boot#%04x %r\n", __FUNCTION__, (UINT32)NvBootOptions[Index].OptionNumber, Status));
+    }
   }
 
   InstallDevicePathCallback ();
-- 
2.19.1.windows.1

Re: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure

[Nate DeSimone]

Your whitespace doesn't quite match edk2 coding style guidelines, but we can fix that during commit.

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Agyeman, Prince <prince.agyeman@intel.com> 
Sent: Wednesday, October 30, 2019 10:05 AM
To: devel@edk2.groups.io
Cc: Sinha, Ankit <ankit.sinha@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Kubacki, Michael A <michael.a.kubacki@intel.com>
Subject: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2225

Currently, gcc 5 encounters an error "unused-but-set-variable" in BdsPlatform.c  as a result of a Status variable not being used after it's set.

This was fixed by printing the Status variable when EfiBootManagerDeleteLoadOptionVariable function encounters an error

Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Kubacki Michael A <michael.a.kubacki@intel.com>

Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
---
 .../Library/PlatformBootManagerLib/BdsPlatform.c              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 7aa3860f75..a4b010be63 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/B
+++ dsPlatform.c
@@ -348,6 +348,10 @@ PlatformBootManagerBeforeConsole (
   NvBootOptions = EfiBootManagerGetLoadOptions (&NvBootOptionCount, LoadOptionTypeBoot);
   for (Index = 0; Index < NvBootOptionCount; Index++) {
     Status = EfiBootManagerDeleteLoadOptionVariable (NvBootOptions[Index].OptionNumber, LoadOptionTypeBoot);
+    if(EFI_ERROR (Status)){
+      DEBUG ((DEBUG_ERROR,
+          "%a: removing Boot#%04x %r\n", __FUNCTION__, (UINT32)NvBootOptions[Index].OptionNumber, Status));
+    }
   }
 
   InstallDevicePathCallback ();
--
2.19.1.windows.1

Re: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure

[Kubacki, Michael A]

Please check whitespace and formatting in the future. I agree with Nate
that it can be fixed when pushed but there's quite a few errors here.

Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

> -----Original Message-----
> From: Agyeman, Prince <prince.agyeman@intel.com>
> Sent: Wednesday, October 30, 2019 10:05 AM
> To: devel@edk2.groups.io
> Cc: Sinha, Ankit <ankit.sinha@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [edk2-platforms] [PATCH] SimicsOpenBoardPkg: Fix gcc build failure
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2225
> 
> Currently, gcc 5 encounters an error "unused-but-set-variable" in
> BdsPlatform.c  as a result of a Status variable not being used after it's set.
> 
> This was fixed by printing the Status variable when
> EfiBootManagerDeleteLoadOptionVariable function encounters an error
> 
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Kubacki Michael A <michael.a.kubacki@intel.com>
> 
> Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
> ---
>  .../Library/PlatformBootManagerLib/BdsPlatform.c              | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/Bds
> Platform.c
> b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/Bd
> sPlatform.c
> index 7aa3860f75..a4b010be63 100644
> ---
> a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/Bds
> Platform.c
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/B
> +++ dsPlatform.c
> @@ -348,6 +348,10 @@ PlatformBootManagerBeforeConsole (
>    NvBootOptions = EfiBootManagerGetLoadOptions (&NvBootOptionCount,
> LoadOptionTypeBoot);
>    for (Index = 0; Index < NvBootOptionCount; Index++) {
>      Status = EfiBootManagerDeleteLoadOptionVariable
> (NvBootOptions[Index].OptionNumber, LoadOptionTypeBoot);
> +    if(EFI_ERROR (Status)){
> +      DEBUG ((DEBUG_ERROR,
> +          "%a: removing Boot#%04x %r\n", __FUNCTION__,
> (UINT32)NvBootOptions[Index].OptionNumber, Status));
> +    }
>    }
> 
>    InstallDevicePathCallback ();
> --
> 2.19.1.windows.1