OvmfPkg/PlatformBootManagerLib: process "-kernel" before boot devices

This improves the UEFI boot time for VMs that have "-kernel", many disks
or NICs, and no "bootindex" properties.

(Unlike in ArmVirt commit 23d04b58e27b, in OvmfPkg commit 52fba28994e9 we
introduced TryRunningQemuKernel() right from the start *after*
BdsLibConnectAll(). Therefore, unlike in patch
'ArmVirtPkg/PlatformBootManagerLib: return to "-kernel before boot
devices"', we adopt the logic as new in this patch.)

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Gabriel Somlo <gsomlo@gmail.com>

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index b624b8f2253545171ee04a176091a8032da31108..862fa6ebb4e5f67f3693e1b4bc281546b77cd8df 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -1450,14 +1450,14 @@ PlatformBootManagerAfterConsole (
   PciAcpiInitialization ();\r
 \r
   //\r
   PciAcpiInitialization ();\r
 \r
   //\r

-  // Perform some platform specific connect sequence\r
+  // Process QEMU's -kernel command line option\r

   //\r
   //\r

-  PlatformBdsConnectSequence ();\r
+  TryRunningQemuKernel ();\r

 \r
   //\r
 \r
   //\r

-  // Process QEMU's -kernel command line option\r
+  // Perform some platform specific connect sequence\r

   //\r
   //\r

-  TryRunningQemuKernel ();\r
+  PlatformBdsConnectSequence ();\r

 \r
   EfiBootManagerRefreshAllBootOption ();\r
 \r
 \r
   EfiBootManagerRefreshAllBootOption ();\r
 \r