From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au [211.29.132.249]) by mx.groups.io with SMTP id smtpd.web10.1353.1627438705194857390 for ; Tue, 27 Jul 2021 19:18:25 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=softfail (domain: linux.com, ip: 211.29.132.249, mailfrom: chris.willing@linux.com) Received: from d8.hgw.net.au (pa49-197-59-136.pa.qld.optusnet.com.au [49.197.59.136]) (Authenticated sender: chris.willing@optusnet.com.au) by mail105.syd.optusnet.com.au (Postfix) with ESMTPA id CD9E010453F8; Wed, 28 Jul 2021 12:18:23 +1000 (AEST) From: "Christoph Willing" To: devel@edk2.groups.io Cc: Christoph Willing Subject: [PATCH 1/1] OvmfPkg PlatformBootManagerLib: Move TryRunningQemuKernel() Date: Wed, 28 Jul 2021 12:02:33 +1000 Message-Id: <20210728020232.127332-2-chris.willing@linux.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210728020232.127332-1-chris.willing@linux.com> References: <20210728020232.127332-1-chris.willing@linux.com> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.3 cv=Tu+Yewfh c=1 sm=1 tr=0 a=Td1b0GxWWDVT73Tj8akgaQ==:117 a=Td1b0GxWWDVT73Tj8akgaQ==:17 a=hqBzw_eTAAAA:8 a=NufY4J3AAAAA:8 a=fqpOqWsNvOZOpF2C5gcA:9 a=bkWp_v3HvcftT6DRAIDL:22 a=TPcZfFuj8SYsoCJAFAiX:22 Content-Transfer-Encoding: quoted-printable Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3504 This change ensures that PlatformBdsConnectSequence() is run before TryRunningQemuKernel(). It reverses commit a34a886962561f6d8550b2a1bb193798ca456431 which aimed to improve UEFI boot time. Unfortunately that commit now results in boot failure when using qemu's -kernel option, therefore rendering the -initrd & -append options useless. Such failures are seen in all releases from edk2-stable201808 to edk2-stable202105 as well as the master branch. The last releases which actually work correctly are vUDK2017 and vUDK2018 as they don't contain the a34a88 commit. This change has been tested with edk2-stable201808, edk2-stable201811, edk2-stable202105 as well as master (at 21/7/2021). It results in correct booting using the -kernel option in all the test cases. No measurable change in boot times was discernible compared with the unaffected vUDK2017 & vUDK2018 releases. Signed-off-by: Christoph Willing --- OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg= /Library/PlatformBootManagerLib/BdsPlatform.c index b0e9742937..f08ace87b3 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -1517,14 +1517,14 @@ PlatformBootManagerAfterConsole ( Tcg2PhysicalPresenceLibProcessRequest (NULL);=0D =0D //=0D - // Process QEMU's -kernel command line option=0D + // Perform some platform specific connect sequence=0D //=0D - TryRunningQemuKernel ();=0D + PlatformBdsConnectSequence ();=0D =0D //=0D - // Perform some platform specific connect sequence=0D + // Process QEMU's -kernel command line option=0D //=0D - PlatformBdsConnectSequence ();=0D + TryRunningQemuKernel ();=0D =0D EfiBootManagerRefreshAllBootOption ();=0D =0D --=20 2.32.0