Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg: Fix device path when boot manager menu is from different FV 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3441

When the boot manager menu is from different FV, the current logic still
use the device path of the FV as the module links to this library

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Acked-by: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
This commit is contained in:
Zhiguang Liu 2021-06-09 16:34:57 +08:00 committed by mergify[bot]
parent 288bd74a22
commit 1ad794b627
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
View File

@ -2405,13 +2405,9 @@ BmRegisterBootManagerMenu (
CHAR16 *Description; CHAR16 *Description;
UINTN DescriptionLength; UINTN DescriptionLength;
EFI_DEVICE_PATH_PROTOCOL *DevicePath; EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
UINTN HandleCount; UINTN HandleCount;
EFI_HANDLE *Handles; EFI_HANDLE *Handles;
UINTN Index; UINTN Index;
VOID *Data;
UINTN DataSize;
DevicePath = NULL; DevicePath = NULL;
Description = NULL; Description = NULL;
@ -2437,22 +2433,17 @@ BmRegisterBootManagerMenu (
} }
if (DevicePath == NULL) { if (DevicePath == NULL) {
Data = NULL; Status = GetFileDevicePathFromAnyFv (
Status = GetSectionFromAnyFv (
PcdGetPtr (PcdBootManagerMenuFile), PcdGetPtr (PcdBootManagerMenuFile),
EFI_SECTION_PE32, EFI_SECTION_PE32,
0, 0,
(VOID **) &Data, &DevicePath
&DataSize
); );
if (Data != NULL) {
FreePool (Data);
}
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be found, skip its boot option registration\n")); DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be found, skip its boot option registration\n"));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
ASSERT (DevicePath != NULL);
// //
// Get BootManagerMenu application's description from EFI User Interface Section. // Get BootManagerMenu application's description from EFI User Interface Section.
// //
@ -2466,19 +2457,6 @@ BmRegisterBootManagerMenu (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Description = NULL; Description = NULL;
} }
EfiInitializeFwVolDevicepathNode (&FileNode, PcdGetPtr (PcdBootManagerMenuFile));
Status = gBS->HandleProtocol (
gImageHandle,
&gEfiLoadedImageProtocolGuid,
(VOID **) &LoadedImage
);
ASSERT_EFI_ERROR (Status);
DevicePath = AppendDevicePathNode (
DevicePathFromHandle (LoadedImage->DeviceHandle),
(EFI_DEVICE_PATH_PROTOCOL *) &FileNode
);
ASSERT (DevicePath != NULL);
} }
Status = EfiBootManagerInitializeLoadOption ( Status = EfiBootManagerInitializeLoadOption (