commit 6348eea63ea79935aeeb305d503e35716f1c1d24
author Laszlo Ersek <lersek@redhat.com> Fri Oct 21 11:59:36 2016 +0200
committer Laszlo Ersek <lersek@redhat.com> Tue Oct 25 10:46:15 2016 +0200
tree b8fba70c49403042a265d7e4322d5850a3aba817
parent 2462bd3d85a77132e317ef90f66ef9d4ae4f54ac

OvmfPkg/EmuVariableFvbRuntimeDxe: eliminate unchecked PcdSetXX() calls

These are deprecated / disabled under the
DISABLE_NEW_DEPRECATED_INTERFACES feature test macro.

Introduce a variable called PcdStatus, and use it to assert the success of
these operations (there is no reason for them to fail here).

Cc: Anthony PERARD <anthony.perard@citrix.com>
Cc: Gary Lin <glin@suse.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=166
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gary Lin <glin@suse.com>
Tested-by: Gary Lin <glin@suse.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c

diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index 7a8beb3..dec6d4a 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
@@ -803,6 +803,7 @@
   BOOLEAN                             Initialize;

   EFI_HANDLE                          Handle;

   EFI_PHYSICAL_ADDRESS                Address;

+  RETURN_STATUS                       PcdStatus;

 

   DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n"));

 

@@ -862,19 +863,24 @@
     SetMem (Ptr, EMU_FVB_SIZE, ERASED_UINT8);

     InitializeFvAndVariableStoreHeaders (Ptr);

   }

-  PcdSet64 (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr);

+  PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr);

+  ASSERT_RETURN_ERROR (PcdStatus);

 

   //

   // Initialize the Fault Tolerant Write data area

   //

   SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize));

-  PcdSet32 (PcdFlashNvStorageFtwWorkingBase, (UINT32)(UINTN) SubPtr);

+  PcdStatus = PcdSet32S (PcdFlashNvStorageFtwWorkingBase,

+                (UINT32)(UINTN) SubPtr);

+  ASSERT_RETURN_ERROR (PcdStatus);

 

   //

   // Initialize the Fault Tolerant Write spare block

   //

   SubPtr = (VOID*) ((UINT8*) Ptr + EMU_FVB_BLOCK_SIZE);

-  PcdSet32 (PcdFlashNvStorageFtwSpareBase, (UINT32)(UINTN) SubPtr);

+  PcdStatus = PcdSet32S (PcdFlashNvStorageFtwSpareBase,

+                (UINT32)(UINTN) SubPtr);

+  ASSERT_RETURN_ERROR (PcdStatus);

 

   //

   // Setup FVB device path