From de6c0eff30a3f10637ec6295988ddc0f4dfdeb6e Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Thu, 2 Jul 2015 04:27:54 +0000 Subject: [PATCH] MdeModulePkg: UefiBootManagerLib to handle LoadFile DevicePath UEFI Spec HTTP Boot Device Path, after retrieving the boot resource information, the BootURI device path node will be updated to include the BootURI information. It means the device path on the child handle will be updated after the LoadFile() service is called. To handle this case, UefiBootManagerLib BmGetLoadOptionBuffer API is updated as the below: 1) Get Device handle based on Device Path 2) Call LoadFile() service (GetFileBufferByFilePath() API) to get Load File Buffer. 3) Retrieve DevicePath from Device handle Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao Reviewed-by: Ruiyu Ni git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17798 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c index 028edc35d5..3691c116a9 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c @@ -1501,9 +1501,18 @@ BmGetLoadOptionBuffer ( // Directly reads the load option when it doesn't reside in simple file system instance (LoadFile/LoadFile2), // or it directly points to a file in simple file system instance. // + Node = FilePath; + Status = gBS->LocateDevicePath (&gEfiLoadFileProtocolGuid, &Node, &Handle); FileBuffer = GetFileBufferByFilePath (TRUE, FilePath, FileSize, &AuthenticationStatus); if (FileBuffer != NULL) { - *FullPath = DuplicateDevicePath (FilePath); + if (EFI_ERROR (Status)) { + *FullPath = DuplicateDevicePath (FilePath); + } else { + // + // LoadFile () may cause the device path of the Handle be updated. + // + *FullPath = AppendDevicePath (DevicePathFromHandle (Handle), Node); + } } return FileBuffer;