summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2021-05-26 22:14:12 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-06-04 16:01:50 +0000
commit747b1ef72543c321c386198641a29de7f8537520 (patch)
tree70139060ecf2cc98a0bbb6b319482e7f83fa89a3
parent6d1e56e71567303435e0fb3173dacd0ff4859efe (diff)
downloadedk2-747b1ef72543c321c386198641a29de7f8537520.tar.gz
edk2-747b1ef72543c321c386198641a29de7f8537520.tar.bz2
edk2-747b1ef72543c321c386198641a29de7f8537520.zip
OvmfPkg/AcpiPlatformDxe: move "QemuLoader.h" to IndustryStandard
Turn the "QemuLoader.h" header into a public (IndustryStandard) one. The QEMU ACPI linker-loader interface is stable between QEMU and multiple guest firmwares. Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20210526201446.12554-10-lersek@redhat.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf1
-rw-r--r--OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c2
-rw-r--r--OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf1
-rw-r--r--OvmfPkg/Include/IndustryStandard/QemuLoader.h (renamed from OvmfPkg/AcpiPlatformDxe/QemuLoader.h)0
4 files changed, 1 insertions, 3 deletions
diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 4522d7f611..3daeb2ee42 100644
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -28,7 +28,6 @@
PciDecoding.c
Qemu.c
QemuFwCfgAcpi.c
- QemuLoader.h
Xen.c
[Packages]
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
index c07b84a213..621e69410d 100644
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
@@ -9,6 +9,7 @@
**/
#include <IndustryStandard/Acpi.h>
+#include <IndustryStandard/QemuLoader.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DxeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
@@ -18,7 +19,6 @@
#include <Library/QemuFwCfgS3Lib.h>
#include "AcpiPlatform.h"
-#include "QemuLoader.h"
//
// The user structure for the ordered collection that will track the fw_cfg
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
index cc24f35bd8..48c8269a8b 100644
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
@@ -27,7 +27,6 @@
PciDecoding.c
QemuFwCfgAcpi.c
QemuFwCfgAcpiPlatform.c
- QemuLoader.h
[Packages]
MdeModulePkg/MdeModulePkg.dec
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuLoader.h b/OvmfPkg/Include/IndustryStandard/QemuLoader.h
index 5782a23c43..5782a23c43 100644
--- a/OvmfPkg/AcpiPlatformDxe/QemuLoader.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuLoader.h