commit 65157adef2c079b30a21740f365f8e26b5481b6c
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:24 2016 +0200
tree 6801096e00b4a4b6d5c466249dedba22e21513bb
parent 32e083c71d1dc650dc197fac5b04cafdb6d01b8b

OvmfPkg/QemuFlashFvbServicesRuntimeDxe: 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: 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: Jordan Justen <jordan.l.justen@intel.com>

OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index c37aed1..ff27c11 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -965,6 +965,7 @@
   EFI_PHYSICAL_ADDRESS                BaseAddress;

   UINTN                               Length;

   UINTN                               NumOfBlocks;

+  RETURN_STATUS                       PcdStatus;

 

   if (EFI_ERROR (QemuFlashInitialize ())) {

     //

@@ -1095,18 +1096,21 @@
   //

   // Set several PCD values to point to flash

   //

-  PcdSet64 (

+  PcdStatus = PcdSet64S (

     PcdFlashNvStorageVariableBase64,

     (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase)

     );

-  PcdSet32 (

+  ASSERT_RETURN_ERROR (PcdStatus);

+  PcdStatus = PcdSet32S (

     PcdFlashNvStorageFtwWorkingBase,

     PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)

     );

-  PcdSet32 (

+  ASSERT_RETURN_ERROR (PcdStatus);

+  PcdStatus = PcdSet32S (

     PcdFlashNvStorageFtwSpareBase,

     PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)

     );

+  ASSERT_RETURN_ERROR (PcdStatus);

 

   FwhInstance = (EFI_FW_VOL_INSTANCE *)

     (

@@ -1119,6 +1123,7 @@
   //

   InstallVirtualAddressChangeHandler ();

 

-  PcdSetBool (PcdOvmfFlashVariablesEnable, TRUE);

+  PcdStatus = PcdSetBoolS (PcdOvmfFlashVariablesEnable, TRUE);

+  ASSERT_RETURN_ERROR (PcdStatus);

   return EFI_SUCCESS;

 }