UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / OvmfPkg / Library / PlatformBootManagerLib / BdsPlatform.c

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 0918c35f1fb7ae888ad17b908392a6e077d2d5c2..98f6f07341ec27e54a7607d63f07bab742dd4d4d 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -418,10 +418,16 @@ PlatformBootManagerBeforeConsole (
     SaveS3BootScript ();\r
   }\r
 \r
+  //\r
   // We need to connect all trusted consoles for TCG PP. Here we treat all\r
   // consoles in OVMF to be trusted consoles.\r
+  //\r
+  // Cloud Hypervisor doesn't emulate any LPC bridge, which is why it must\r
+  // rely on the serial I/O port to be connected as a console. It reuses the\r
+  // definition from Xen as it is very generic.\r
+  //\r
   PlatformInitializeConsole (\r
-    XenDetected () ? gXenPlatformConsole : gPlatformConsole\r
+    (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) == CLOUDHV_DEVICE_ID) ? gXenPlatformConsole : gPlatformConsole\r
     );\r
 \r
   //\r
@@ -1688,6 +1694,11 @@ PlatformBootManagerAfterConsole (
   //\r
   PciAcpiInitialization ();\r
 \r
+  //\r
+  // Write qemu bootorder to efi variables\r
+  //\r
+  StoreQemuBootOrder ();\r
+\r
   //\r
   // Process QEMU's -kernel command line option\r
   //\r