On 07/04/18 03:50, Ruiyu Ni wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> ---
> .../Library/PlatformBootManagerLib/PlatformBm.c | 62 +++++++++++++++++++++-
> 1 file changed, 61 insertions(+), 1 deletion(-)
>
> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> index 62cce6a01e..bb07f5e22b 100644
> --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -3,7 +3,7 @@
>
> Copyright (C) 2015-2016, Red Hat, Inc.
> Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
> - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
>
> This program and the accompanying materials are licensed and made available
> under the terms and conditions of the BSD License which accompanies this
> @@ -865,3 +865,63 @@ PlatformBootManagerWaitCallback (
> 0
> );
> }
> +
> +/**
> + The function is called when no boot option could be launched,
> + including platform recovery options and options pointing to applications
> + built into firmware volumes.
> +
> + If this function returns, BDS attempts to enter an infinite loop.
> +**/
> +VOID
> +EFIAPI
> +PlatformBootManagerUnableToBoot (
> + VOID
> + )
> +{
> + EFI_STATUS Status;
> + EFI_INPUT_KEY Key;
> + EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu;
> + UINTN Index;
> +
> + //
> + // BootManagerMenu doesn't contain the correct information when return status
> + // is EFI_NOT_FOUND.
> + //
> + Status = EfiBootManagerGetBootManagerMenu (&BootManagerMenu);
> + if (EFI_ERROR (Status)) {
> + return;
> + }
> + //
> + // Normally BdsDxe does not print anything to the system console, but this is
> + // a last resort -- the end-user will likely not see any DEBUG messages
> + // logged in this situation.
> + //
> + // AsciiPrint() will NULL-check gST->ConOut internally. We check gST->ConIn
> + // here to see if it makes sense to request and wait for a keypress.
> + //
> + if (gST->ConIn != NULL) {
> + AsciiPrint (
> + "%a: No bootable option or device was found.\n"
> + "%a: Press any key to enter the Boot Manager Menu.\n",
> + gEfiCallerBaseName,
> + gEfiCallerBaseName
> + );
> + Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Index);
> + ASSERT_EFI_ERROR (Status);
> + ASSERT (Index == 0);
> +
> + //
> + // Drain any queued keys.
> + //
> + while (!EFI_ERROR (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key))) {
> + //
> + // just throw away Key
> + //
> + }
> + }
> +
> + for (;;) {
> + EfiBootManagerBoot (&BootManagerMenu);
> + }
> +}
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thank you, Ray!
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel