summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg/Library
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2018-03-13 19:32:55 +0100
committerLaszlo Ersek <lersek@redhat.com>2018-03-14 11:24:30 +0100
commitff1d0fbfbaec55038ccf888759588fa4e21516f4 (patch)
tree930043f9abb81716f5b0b01ab1166a9e00aab931 /ArmVirtPkg/Library
parent245c643cc8b73240c3b88cb55b2911b285a8c10d (diff)
downloadedk2-ff1d0fbfbaec55038ccf888759588fa4e21516f4.tar.gz
edk2-ff1d0fbfbaec55038ccf888759588fa4e21516f4.tar.bz2
edk2-ff1d0fbfbaec55038ccf888759588fa4e21516f4.zip
ArmVirtPkg/PlatformBootManagerLib: minimize the set of connected devices
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>
Diffstat (limited to 'ArmVirtPkg/Library')
-rw-r--r--ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index f9591964d5..36e0eed238 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -663,15 +663,23 @@ PlatformBootManagerAfterConsole (
VOID
)
{
+ RETURN_STATUS Status;
+
//
// Show the splash screen.
//
BootLogoEnableLogo ();
//
- // Connect the rest of the devices.
+ // Connect the purported boot devices.
//
- EfiBootManagerConnectAll ();
+ Status = ConnectDevicesFromQemu ();
+ if (RETURN_ERROR (Status)) {
+ //
+ // Connect the rest of the devices.
+ //
+ EfiBootManagerConnectAll ();
+ }
//
// Process QEMU's -kernel command line option. Note that the kernel booted