ArmVirtPkg/PlatformHasAcpiDtDxe: allow guest level ACPI disable override

[mirror_edk2.git] / ArmVirtPkg / PlatformHasAcpiDtDxe / PlatformHasAcpiDtDxe.c

diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c
index 8932dacabec5e72a82db7b10af87daae502941b3..da3cee645cfbe8597aa543067f998e621b8d95ad 100644 (file)
--- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c
+++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c
@@ -17,6 +17,7 @@
 #include <Guid/PlatformHasDeviceTree.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 \r
@@ -37,6 +38,7 @@ PlatformHasAcpiDt (
   // errors here.\r
   //\r
   if (MAX_UINTN == MAX_UINT64 &&\r
+      !PcdGetBool (PcdForceNoAcpi) &&\r
       !EFI_ERROR (\r
          QemuFwCfgFindFile (\r
            "etc/table-loader",\r