Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"

[mirror_edk2.git] / OvmfPkg / AcpiPlatformDxe / AcpiPlatform.c

diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
index f2c49953950bf38a50e5ab818ea90cfc725855b9..2b529d58a15c663cabefd7de1947de0e3649e37f 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
@@ -161,6 +161,11 @@ InstallOvmfFvTables (
     TableInstallFunction = InstallAcpiTable;\r
   }\r
 \r
+  //\r
+  // set FwVol (and use an ASSERT() below) to suppress incorrect\r
+  // compiler/analyzer warnings\r
+  //\r
+  FwVol = NULL;\r
   //\r
   // Locate the firmware volume protocol\r
   //\r
@@ -168,6 +173,8 @@ InstallOvmfFvTables (
   if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
+  ASSERT (FwVol != NULL);\r
+\r
   //\r
   // Read tables from the storage file.\r
   //\r