OvmfPkg/QemuFlashFvbServices: factor out SetPcdFlashNvStorageBaseAddresses

[mirror_edk2.git] / OvmfPkg / QemuFlashFvbServicesRuntimeDxe / FwBlockService.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index b7b99129a80e782289bfc853bf5781dfa7c1e9af..76a7853de04df71d80a1c8516483e260345e614f 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -1051,24 +1051,7 @@ FvbInitialize (
 \r
   MarkIoMemoryRangeForRuntimeAccess (BaseAddress, Length);\r
 \r
-  //\r
-  // Set several PCD values to point to flash\r
-  //\r
-  PcdStatus = PcdSet64S (\r
-    PcdFlashNvStorageVariableBase64,\r
-    (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
-    );\r
-  ASSERT_RETURN_ERROR (PcdStatus);\r
-  PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwWorkingBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
-    );\r
-  ASSERT_RETURN_ERROR (PcdStatus);\r
-  PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwSpareBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
-    );\r
-  ASSERT_RETURN_ERROR (PcdStatus);\r
+  SetPcdFlashNvStorageBaseAddresses ();\r
 \r
   FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
     (\r