OvmfPkg/SmmCpuFeaturesLib: SEV: encrypt+free pages of init. save state map

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

diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
index 331cdc40505930124e032b11e8676bb859b431d2..61166c65c33cd2c366b4b8d11df95f522bff5a43 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
@@ -130,14 +130,20 @@ LocateFvInstanceWithTables (
 \r
 \r
 /**\r
-  Find ACPI tables in an FV and parses them. This function is useful for QEMU and KVM.\r
+  Find ACPI tables in an FV and install them. \r
+\r
+  This is now a fall-back path. Normally, we will search for tables provided\r
+  by the VMM first.\r
+\r
+  If that fails, we use this function to load the ACPI tables from an FV. The\r
+  sources for the FV based tables is located under OvmfPkg/AcpiTables.\r
 \r
   @param  AcpiTable     Protocol instance pointer    \r
 \r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-FindAcpiTablesInFv (\r
+InstallOvmfFvTables (\r
   IN  EFI_ACPI_TABLE_PROTOCOL     *AcpiTable\r
   )\r
 {\r
@@ -222,7 +228,7 @@ FindAcpiTablesInFv (
 }\r
 \r
 /**\r
-  Entrypoint of Acpi Platform driver.\r
+  Effective entrypoint of Acpi Platform driver.\r
 \r
   @param  ImageHandle\r
   @param  SystemTable\r
@@ -234,32 +240,20 @@ FindAcpiTablesInFv (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-AcpiPlatformEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+InstallAcpiTables (\r
+  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
   )\r
 {\r
   EFI_STATUS                         Status;\r
-  EFI_ACPI_TABLE_PROTOCOL            *AcpiTable;\r
-\r
-  //\r
-  // Find the AcpiTable protocol\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiAcpiTableProtocolGuid,\r
-                  NULL,\r
-                  (VOID**)&AcpiTable\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
 \r
   if (XenDetected ()) {\r
     Status = InstallXenTables (AcpiTable);\r
   } else {\r
-    Status = InstallAllQemuLinkedTables (AcpiTable);\r
+    Status = InstallQemuFwCfgTables (AcpiTable);\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    Status = FindAcpiTablesInFv (AcpiTable);\r
+    Status = InstallOvmfFvTables (AcpiTable);\r
   }\r
 \r
   return Status;\r