loader.efi: boot1.c was left out of 350654
Followup for 350654.
This commit is contained in:
parent
110d56cbf4
commit
cefffc0b45
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=350655
@ -137,8 +137,9 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, void *loaderbuf, size_t load
|
|||||||
goto errout;
|
goto errout;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((status = BS->HandleProtocol(loaderhandle, &LoadedImageGUID,
|
status = OpenProtocolByHandle(loaderhandle, &LoadedImageGUID,
|
||||||
(VOID**)&loaded_image)) != EFI_SUCCESS) {
|
(void **)&loaded_image);
|
||||||
|
if (status != EFI_SUCCESS) {
|
||||||
printf("Failed to query LoadedImage provided by %s (%lu)\n",
|
printf("Failed to query LoadedImage provided by %s (%lu)\n",
|
||||||
mod->name, EFI_ERROR_CODE(status));
|
mod->name, EFI_ERROR_CODE(status));
|
||||||
goto errout;
|
goto errout;
|
||||||
@ -242,7 +243,7 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
|
|||||||
nhandles = hsize / sizeof(*handles);
|
nhandles = hsize / sizeof(*handles);
|
||||||
|
|
||||||
/* Determine the devpath of our image so we can prefer it. */
|
/* Determine the devpath of our image so we can prefer it. */
|
||||||
status = BS->HandleProtocol(IH, &LoadedImageGUID, (VOID**)&img);
|
status = OpenProtocolByHandle(IH, &LoadedImageGUID, (void **)&img);
|
||||||
imgpath = NULL;
|
imgpath = NULL;
|
||||||
if (status == EFI_SUCCESS) {
|
if (status == EFI_SUCCESS) {
|
||||||
text = efi_devpath_name(img->FilePath);
|
text = efi_devpath_name(img->FilePath);
|
||||||
@ -252,8 +253,8 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
|
|||||||
efi_free_devpath_name(text);
|
efi_free_devpath_name(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
status = BS->HandleProtocol(img->DeviceHandle, &DevicePathGUID,
|
status = OpenProtocolByHandle(img->DeviceHandle,
|
||||||
(void **)&imgpath);
|
&DevicePathGUID, (void **)&imgpath);
|
||||||
if (status != EFI_SUCCESS) {
|
if (status != EFI_SUCCESS) {
|
||||||
DPRINTF("Failed to get image DevicePath (%lu)\n",
|
DPRINTF("Failed to get image DevicePath (%lu)\n",
|
||||||
EFI_ERROR_CODE(status));
|
EFI_ERROR_CODE(status));
|
||||||
|
Loading…
Reference in New Issue
Block a user