Author: tsoome
Date: Tue Aug 6 20:08:01 2019
New Revision: 350655
URL: https://svnweb.freebsd.org/changeset/base/350655
Log:
loader.efi: boot1.c was left out of 350654
Followup for 350654.
Modified:
head/stand/efi/boot1/boot1.c
Modified: head/stand/efi/boot1/boot1.c
==============================================================================
--- head/stand/efi/boot1/boot1.c Tue Aug 6 19:27:27 2019
(r350654)
+++ head/stand/efi/boot1/boot1.c Tue Aug 6 20:08:01 2019
(r350655)
@@ -137,8 +137,9 @@ try_boot(const boot_module_t *mod, dev_info_t *dev, vo
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));
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
