OvmfPkg/SmbiosVersionLib: 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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> # RVCT
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
index 950c3f7e0a..58180412bd 100644
--- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
+++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
@@ -40,6 +40,7 @@ DetectSmbiosVersion (
   UINTN                AnchorSize, TablesSize;

   QEMU_SMBIOS_ANCHOR   QemuAnchor;

   UINT16               SmbiosVersion;

+  RETURN_STATUS        PcdStatus;

 

   if (PcdGetBool (PcdQemuSmbiosValidated)) {

     //

@@ -87,7 +88,8 @@ DetectSmbiosVersion (
 

     DEBUG ((EFI_D_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",

       __FUNCTION__, QemuAnchor.V3.DocRev));

-    PcdSet8 (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);

+    PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);

+    ASSERT_RETURN_ERROR (PcdStatus);

     break;

 

   default:

@@ -96,12 +98,14 @@ DetectSmbiosVersion (
 

   DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,

     SmbiosVersion));

-  PcdSet16 (PcdSmbiosVersion, SmbiosVersion);

+  PcdStatus = PcdSet16S (PcdSmbiosVersion, SmbiosVersion);

+  ASSERT_RETURN_ERROR (PcdStatus);

 

   //

   // SMBIOS platform drivers can now fetch and install

   // "etc/smbios/smbios-tables" from QEMU.

   //

-  PcdSetBool (PcdQemuSmbiosValidated, TRUE);

+  PcdStatus = PcdSetBoolS (PcdQemuSmbiosValidated, TRUE);

+  ASSERT_RETURN_ERROR (PcdStatus);

   return RETURN_SUCCESS;

 }