diff options
| author | Toomas Soome <tsoome@FreeBSD.org> | 2019-08-06 20:08:01 +0000 |
|---|---|---|
| committer | Toomas Soome <tsoome@FreeBSD.org> | 2019-08-06 20:08:01 +0000 |
| commit | cefffc0b45f2263ef3db1c31a1d1efced6043f0d (patch) | |
| tree | be2a775c4521379bdf0e9c0837cf547a362e7da2 /stand/efi | |
| parent | 110d56cbf438a76ef37735cec8aa02518d0d1f4a (diff) | |
loader.efi: boot1.c was left out of 350654
Followup for 350654.
Notes
Notes:
svn path=/head/; revision=350655
Diffstat (limited to 'stand/efi')
| -rw-r--r-- | stand/efi/boot1/boot1.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c index cbdd3bb31fc7..b0c85c5dfee1 100644 --- a/stand/efi/boot1/boot1.c +++ b/stand/efi/boot1/boot1.c @@ -137,8 +137,9 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, void *loaderbuf, size_t load goto errout; } - if ((status = BS->HandleProtocol(loaderhandle, &LoadedImageGUID, - (VOID**)&loaded_image)) != EFI_SUCCESS) { + status = OpenProtocolByHandle(loaderhandle, &LoadedImageGUID, + (void **)&loaded_image); + if (status != EFI_SUCCESS) { printf("Failed to query LoadedImage provided by %s (%lu)\n", mod->name, EFI_ERROR_CODE(status)); goto errout; @@ -242,7 +243,7 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) nhandles = hsize / sizeof(*handles); /* 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; if (status == EFI_SUCCESS) { text = efi_devpath_name(img->FilePath); @@ -252,8 +253,8 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) efi_free_devpath_name(text); } - status = BS->HandleProtocol(img->DeviceHandle, &DevicePathGUID, - (void **)&imgpath); + status = OpenProtocolByHandle(img->DeviceHandle, + &DevicePathGUID, (void **)&imgpath); if (status != EFI_SUCCESS) { DPRINTF("Failed to get image DevicePath (%lu)\n", EFI_ERROR_CODE(status)); |