Page MenuHomeFreeBSD
Files F167827571

D32226.id95954.diff
No OneTemporary
Actions

D32226.id95954.diff
View Options

Index: stand/efi/include/efilib.h
===================================================================
--- stand/efi/include/efilib.h
+++ stand/efi/include/efilib.h
@@ -69,9 +69,21 @@
pdinfo_t *efiblk_get_pdinfo_by_handle(EFI_HANDLE h);
pdinfo_t *efiblk_get_pdinfo_by_device_path(EFI_DEVICE_PATH *path);
+/* libefi.c */
void *efi_get_table(EFI_GUID *tbl);
EFI_STATUS OpenProtocolByHandle(EFI_HANDLE, EFI_GUID *, void **);
+static inline EFI_STATUS
+efi_exit_boot_services(UINTN key)
+{
+ EFI_STATUS status;
+
+ status = BS->ExitBootServices(IH, key);
+ if (!EFI_ERROR(status))
+ boot_services_active = false;
+ return (status);
+}
+
int efi_getdev(void **vdev, const char *devspec, const char **path);
char *efi_fmtdev(void *vdev);
int efi_setcurrdev(struct env_var *ev, int flags, const void *value);
Index: stand/efi/loader/bootinfo.c
===================================================================
--- stand/efi/loader/bootinfo.c
+++ stand/efi/loader/bootinfo.c
@@ -393,11 +393,9 @@
if (!exit_bs)
break;
- status = BS->ExitBootServices(IH, efi_mapkey);
- if (!EFI_ERROR(status)) {
- boot_services_active = false;
+ status = efi_exit_boot_services(efi_mapkey);
+ if (!EFI_ERROR(status))
break;
- }
}
if (retry == 0) {

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 7:53 PM (6 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37249276
Default Alt Text
D32226.id95954.diff (1 KB)

Event Timeline