diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-04-20 18:09:21 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-05-04 08:47:41 +0800 |
| commit | 04fe914ba53e17745b8ada0dfef3bf0f8d1cb540 (patch) | |
| tree | 20513644247a97c144a4c6389c9aab122efc9704 | |
| parent | fed691a6f9138c3c22d075a9597435be43e660d0 (diff) | |
| download | edk2-04fe914ba53e17745b8ada0dfef3bf0f8d1cb540.zip edk2-04fe914ba53e17745b8ada0dfef3bf0f8d1cb540.tar.gz edk2-04fe914ba53e17745b8ada0dfef3bf0f8d1cb540.tar.bz2 | |
OvmfPkg/PlatformBootManagerLib: Use EfiBootManagerRefreshAllBootOption()
The patch uses EfiBootManagerRefreshAllBootOption() to collect
all boot options and uses SetBootOrderFromQemu exposed by
QemuNewBootOrderLib to adjust the boot option order.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 11 | ||||
| -rw-r--r-- | OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c index 722776b..c13e8f8 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -14,7 +14,6 @@ #include "BdsPlatform.h"
#include <Guid/RootBridgesConnectedEventGroup.h>
-#include <Library/QemuBootOrderLib.h>
//
@@ -1389,14 +1388,10 @@ Routine Description: // Process QEMU's -kernel command line option
//
TryRunningQemuKernel ();
- BdsLibEnumerateAllBootOption (BootOptionList);
- SetBootOrderFromQemu (BootOptionList);
- //
- // The BootOrder variable may have changed, reload the in-memory list with
- // it.
- //
- BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");
+ EfiBootManagerRefreshAllBootOption ();
+
+ SetBootOrderFromQemu (NULL);
}
/**
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h index b14410c..4950d3a 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h @@ -47,6 +47,7 @@ Abstract: #include <Library/IoLib.h>
#include <Library/NvVarsFileLib.h>
#include <Library/QemuFwCfgLib.h>
+#include <Library/QemuBootOrderLib.h>
#include <Protocol/Decompress.h>
#include <Protocol/PciIo.h>
|