tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg, ArmVirtPkg: clean up SetBootOrderFromQemu() parameter list 

With OvmfPkg's original QemuBootOrderLib (and USE_OLD_BDS) gone, we no
longer need the BootOptionList parameter in the SetBootOrderFromQemu()
prototype. Update the library class header file (including the function's
documentation), and adapt the library instance and the call sites.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Ching-Pang Lin <glin@suse.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Laszlo Ersek 2016-05-17 19:22:17 +02:00
parent 35d3e9c522
commit 2542feea2e
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,7 +551,7 @@ PlatformBootManagerAfterConsole (
// the QEMU configuration. // the QEMU configuration.
// //
EfiBootManagerRefreshAllBootOption (); EfiBootManagerRefreshAllBootOption ();
SetBootOrderFromQemu (NULL); SetBootOrderFromQemu ();
} }
/** /**

11
OvmfPkg/Include/Library/QemuBootOrderLib.h
View File

@ -26,12 +26,11 @@
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the
OpenFirmware device paths therein to UEFI device path fragments. Match the OpenFirmware device paths therein to UEFI device path fragments. Match the
translated fragments against BootOptionList, and rewrite the BootOrder NvVar translated fragments against the current list of boot options, and rewrite
so that it corresponds to the order described in fw_cfg. the BootOrder NvVar so that it corresponds to the order described in fw_cfg.
@param[in] BootOptionList A boot option list, created with
BdsLibEnumerateAllBootOption ().
Platform BDS should call this function after EfiBootManagerConnectAll () and
EfiBootManagerRefreshAllBootOption () return.
@retval RETURN_SUCCESS BootOrder NvVar rewritten. @retval RETURN_SUCCESS BootOrder NvVar rewritten.
@ -51,7 +50,7 @@
**/ **/
RETURN_STATUS RETURN_STATUS
SetBootOrderFromQemu ( SetBootOrderFromQemu (
IN CONST LIST_ENTRY *BootOptionList VOID
); );

2
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
View File

@ -1305,7 +1305,7 @@ Routine Description:
PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
); );
SetBootOrderFromQemu (NULL); SetBootOrderFromQemu ();
} }
/** /**

20
OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c
View File

@ -1696,12 +1696,11 @@ PruneBootVariables (
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the
OpenFirmware device paths therein to UEFI device path fragments. Match the OpenFirmware device paths therein to UEFI device path fragments. Match the
translated fragments against BootOptionList, and rewrite the BootOrder NvVar translated fragments against the current list of boot options, and rewrite
so that it corresponds to the order described in fw_cfg. the BootOrder NvVar so that it corresponds to the order described in fw_cfg.
@param[in] BootOptionList A boot option list, created with
BdsLibEnumerateAllBootOption ().
Platform BDS should call this function after EfiBootManagerConnectAll () and
EfiBootManagerRefreshAllBootOption () return.
@retval RETURN_SUCCESS BootOrder NvVar rewritten. @retval RETURN_SUCCESS BootOrder NvVar rewritten.
@ -1721,7 +1720,7 @@ PruneBootVariables (
**/ **/
RETURN_STATUS RETURN_STATUS
SetBootOrderFromQemu ( SetBootOrderFromQemu (
IN CONST LIST_ENTRY *BootOptionList VOID
) )
{ {
RETURN_STATUS Status; RETURN_STATUS Status;
@ -1741,15 +1740,6 @@ SetBootOrderFromQemu (
EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions; EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
UINTN BootOptionCount; UINTN BootOptionCount;
//
// The QemuBootOrderLib is linked by OvmfPkg and ArmVirtPkg.
// OvmfPkg was changed to use the new BDS @ MdeModulePkg, so boot options
// are no longer stored in linked list.
// But we don't change the QemuBootOrderLib class interface because
// ArmVirtPkg are still using old BDS @ IntelFrameworkModulePkg.
//
ASSERT (BootOptionList == NULL);
Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize); Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);
if (Status != RETURN_SUCCESS) { if (Status != RETURN_SUCCESS) {
return Status; return Status;