1 files changed, 6 insertions, 3 deletions
diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index a03e9097c3..ae43f9c21d 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -289,14 +289,17 @@ PlatformBdsPolicyBehavior (
   Status = PlatformBdsConnectConsole ();
   ASSERT_EFI_ERROR (Status);
 
+  BdsLibConnectAll ();
+
   //
-  // Process QEMU's -kernel command line option
+  // Process QEMU's -kernel command line option. Note that the kernel booted
+  // this way should receive ACPI tables, which is why we connect all devices
+  // first (see above) -- PCI enumeration blocks ACPI table installation, if
+  // there is a PCI host.
   //
   TryRunningQemuKernel ();
 
-  BdsLibConnectAll ();
   BdsLibEnumerateAllBootOption (BootOptionList);
-
   SetBootOrderFromQemu (BootOptionList);
   //
   // The BootOrder variable may have changed, reload the in-memory list with