ArmVirtPkg/PlatformBootManagerLib: minimize the set of connected devices
authorLaszlo Ersek <lersek@redhat.com>
Tue, 13 Mar 2018 18:32:55 +0000 (19:32 +0100)
committerLaszlo Ersek <lersek@redhat.com>
Wed, 14 Mar 2018 10:24:30 +0000 (11:24 +0100)
Prefer ConnectDevicesFromQemu() to EfiBootManagerConnectAll().

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: Xiang Zheng <xiang.zheng@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> # ArmVirtQemu
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Xiang Zheng <xiang.zheng@linaro.org>
ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c

index f959196..36e0eed 100644 (file)
@@ -663,15 +663,23 @@ PlatformBootManagerAfterConsole (
   VOID\r
   )\r
 {\r
+  RETURN_STATUS Status;\r
+\r
   //\r
   // Show the splash screen.\r
   //\r
   BootLogoEnableLogo ();\r
 \r
   //\r
-  // Connect the rest of the devices.\r
+  // Connect the purported boot devices.\r
   //\r
-  EfiBootManagerConnectAll ();\r
+  Status = ConnectDevicesFromQemu ();\r
+  if (RETURN_ERROR (Status)) {\r
+    //\r
+    // Connect the rest of the devices.\r
+    //\r
+    EfiBootManagerConnectAll ();\r
+  }\r
 \r
   //\r
   // Process QEMU's -kernel command line option. Note that the kernel booted\r