On 05/11/16 10:40, Gary Lin wrote: > We currently register the shell before creating the boot options for > the block devices and the network devices, so the boot manager boots > into the internal shell if the user doesn't specify the boot order. > However, Xen doesn't support fw_cfg, so there is no way to change the > boot order with the external command, and the firmware will always > boot into the internal shell if the user doesn't interfere the boot > process. > > This patch postpones the shell registration after MdeModulePkg/BDS > creates all the boot options for the block and network devices, so > that firmware will try to boot the block/network devices first. > > Cc: Laszlo Ersek <[email protected]> > Cc: Jordan Justen <[email protected]> > Cc: Ruiyu Ni <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin <[email protected]> > --- > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index cf774a1..a16453d 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -184,12 +184,6 @@ PlatformRegisterOptionsAndKeys ( > NULL, (UINT16) BootOption.OptionNumber, 0, &Esc, NULL > ); > ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED); > - // > - // Register UEFI Shell > - // > - PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > - ); > } > > EFI_STATUS > @@ -1304,6 +1298,13 @@ Routine Description: > > EfiBootManagerRefreshAllBootOption (); > > + // > + // Register UEFI Shell > + // > + PlatformRegisterFvBootOption ( > + PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > + ); > + > SetBootOrderFromQemu (NULL); > } > >
Looks good to me: Reviewed-by: Laszlo Ersek <[email protected]> I'd also like to get an R-b from Ray, before committing the patch. Thanks! Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
