summaryrefslogtreecommitdiff
path: root/OvmfPkg
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-05-17 19:22:17 +0200
committerLaszlo Ersek <lersek@redhat.com>2016-05-25 12:25:19 +0200
commit2542feea2ecd4dc73ee54cb32c875839413eed05 (patch)
treeed12b43002c187a06563243ef5c9b2cce46df2ca /OvmfPkg
parent35d3e9c5222304b2015566955a6c427016368793 (diff)
downloadedk2-platforms-2542feea2ecd4dc73ee54cb32c875839413eed05.tar.xz
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>
Diffstat (limited to 'OvmfPkg')
-rw-r--r--OvmfPkg/Include/Library/QemuBootOrderLib.h11
-rw-r--r--OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c2
-rw-r--r--OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c20
3 files changed, 11 insertions, 22 deletions
diff --git a/OvmfPkg/Include/Library/QemuBootOrderLib.h b/OvmfPkg/Include/Library/QemuBootOrderLib.h
index 80d02c80c2..743a717824 100644
--- a/OvmfPkg/Include/Library/QemuBootOrderLib.h
+++ b/OvmfPkg/Include/Library/QemuBootOrderLib.h
@@ -26,12 +26,11 @@
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the
OpenFirmware device paths therein to UEFI device path fragments. Match the
- translated fragments against BootOptionList, and rewrite the BootOrder NvVar
- so that it corresponds to the order described in fw_cfg.
-
- @param[in] BootOptionList A boot option list, created with
- BdsLibEnumerateAllBootOption ().
+ translated fragments against the current list of boot options, and rewrite
+ the BootOrder NvVar so that it corresponds to the order described in fw_cfg.
+ Platform BDS should call this function after EfiBootManagerConnectAll () and
+ EfiBootManagerRefreshAllBootOption () return.
@retval RETURN_SUCCESS BootOrder NvVar rewritten.
@@ -51,7 +50,7 @@
**/
RETURN_STATUS
SetBootOrderFromQemu (
- IN CONST LIST_ENTRY *BootOptionList
+ VOID
);
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index a16453d289..da4cb728c6 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -1305,7 +1305,7 @@ Routine Description:
PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
);
- SetBootOrderFromQemu (NULL);
+ SetBootOrderFromQemu ();
}
/**
diff --git a/OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c
index c5f165ae4e..86082301a8 100644
--- a/OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c
+++ b/OvmfPkg/Library/QemuNewBootOrderLib/QemuBootOrderLib.c
@@ -1696,12 +1696,11 @@ PruneBootVariables (
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate the
OpenFirmware device paths therein to UEFI device path fragments. Match the
- translated fragments against BootOptionList, and rewrite the BootOrder NvVar
- so that it corresponds to the order described in fw_cfg.
-
- @param[in] BootOptionList A boot option list, created with
- BdsLibEnumerateAllBootOption ().
+ translated fragments against the current list of boot options, and rewrite
+ the BootOrder NvVar so that it corresponds to the order described in fw_cfg.
+ Platform BDS should call this function after EfiBootManagerConnectAll () and
+ EfiBootManagerRefreshAllBootOption () return.
@retval RETURN_SUCCESS BootOrder NvVar rewritten.
@@ -1721,7 +1720,7 @@ PruneBootVariables (
**/
RETURN_STATUS
SetBootOrderFromQemu (
- IN CONST LIST_ENTRY *BootOptionList
+ VOID
)
{
RETURN_STATUS Status;
@@ -1741,15 +1740,6 @@ SetBootOrderFromQemu (
EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
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);
if (Status != RETURN_SUCCESS) {
return Status;