tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 07:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmVirtPkg/PlatformBootManagerLib: sync Timeout with PcdPlatformBootTimeOut

Browse Source 
Set the Timeout global variable to the same value as
PcdPlatformBootTimeOut. This way the "setvar" command in the UEFI shell,
and the "efibootmgr" command in a Linux guest, can report the front page
timeout that was requested on the QEMU command line (see
GetFrontPageTimeoutFromQemu()).

A DEBUG_VERBOSE message is logged on success too, for our QE team's sake.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200304094413.19462-3-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
This commit is contained in:
Laszlo Ersek 2020-03-04 10:44:13 +01:00 committed by mergify[bot]
parent 9b08c655ff
commit 7288ff4095
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
View File

@ -25,6 +25,7 @@
#include <Protocol/PciRootBridgeIo.h> #include <Protocol/PciRootBridgeIo.h>
#include <Protocol/VirtioDevice.h> #include <Protocol/VirtioDevice.h>
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>
#include <Guid/GlobalVariable.h>
#include <Guid/RootBridgesConnectedEventGroup.h> #include <Guid/RootBridgesConnectedEventGroup.h>
#include <Guid/SerialPortLibVendor.h> #include <Guid/SerialPortLibVendor.h>
@ -686,7 +687,9 @@ PlatformBootManagerBeforeConsole (
VOID VOID
) )
{ {
UINT16 FrontPageTimeout;
RETURN_STATUS PcdStatus; RETURN_STATUS PcdStatus;
EFI_STATUS Status;
// //
// Signal EndOfDxe PI Event // Signal EndOfDxe PI Event
@ -744,9 +747,29 @@ PlatformBootManagerBeforeConsole (
// //
// Set the front page timeout from the QEMU configuration. // Set the front page timeout from the QEMU configuration.
// //
PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout = GetFrontPageTimeoutFromQemu ();
GetFrontPageTimeoutFromQemu ()); PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (PcdStatus);
//
// Reflect the PCD in the standard Timeout variable.
//
Status = gRT->SetVariable (
EFI_TIME_OUT_VARIABLE_NAME,
&gEfiGlobalVariableGuid,
(EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS),
sizeof FrontPageTimeout,
&FrontPageTimeout
);
DEBUG ((
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: SetVariable(%s, %u): %r\n",
__FUNCTION__,
EFI_TIME_OUT_VARIABLE_NAME,
FrontPageTimeout,
Status
));
// //
// Register platform-specific boot options and keyboard shortcuts. // Register platform-specific boot options and keyboard shortcuts.

1
ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@ -68,6 +68,7 @@
gEfiFileSystemInfoGuid gEfiFileSystemInfoGuid
gEfiFileSystemVolumeLabelInfoIdGuid gEfiFileSystemVolumeLabelInfoIdGuid
gEfiEndOfDxeEventGroupGuid gEfiEndOfDxeEventGroupGuid
gEfiGlobalVariableGuid
gRootBridgesConnectedEventGroupGuid gRootBridgesConnectedEventGroupGuid
gUefiShellFileGuid gUefiShellFileGuid