diff options
| author | Warner Losh <imp@FreeBSD.org> | 2019-04-22 18:40:24 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2019-04-22 18:40:24 +0000 |
| commit | 59a05bdf354d7c3caf5f249f55b1496ac1324270 (patch) | |
| tree | 310592babf004d96995d5d441b65e4001ced834f /stand/efi/include | |
| parent | 1109b774513f471d3b62ea220243c8e14d482f03 (diff) | |
| download | src-59a05bdf354d7c3caf5f249f55b1496ac1324270.tar.gz src-59a05bdf354d7c3caf5f249f55b1496ac1324270.zip | |
Create boot_img as a global variable
Get the information from the image that we're booting and store it in
a global variable. Prefer using this to passing it around. Remove the
special case for zfs that set the preferred boot handle by having it
uses this global variable diretly.
Reviewed by: kevans@
Differential Revision: https://reviews.freebsd.org/D20015
Notes
Notes:
svn path=/head/; revision=346575
Diffstat (limited to 'stand/efi/include')
| -rw-r--r-- | stand/efi/include/efi.h | 5 | ||||
| -rw-r--r-- | stand/efi/include/efizfs.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/stand/efi/include/efi.h b/stand/efi/include/efi.h index 0a48218f3664..fe8d78286529 100644 --- a/stand/efi/include/efi.h +++ b/stand/efi/include/efi.h @@ -62,6 +62,11 @@ Revision History #include "efiuga.h" /* + * Global variables + */ +extern EFI_LOADED_IMAGE *boot_img; + +/* * FreeBSD UUID */ #define FREEBSD_BOOT_VAR_GUID \ diff --git a/stand/efi/include/efizfs.h b/stand/efi/include/efizfs.h index 80f12302352a..97f28097b2a1 100644 --- a/stand/efi/include/efizfs.h +++ b/stand/efi/include/efizfs.h @@ -50,10 +50,8 @@ void efi_zfs_probe(void); EFI_HANDLE efizfs_get_handle_by_guid(uint64_t); bool efizfs_get_guid_by_handle(EFI_HANDLE, uint64_t *); zfsinfo_list_t *efizfs_get_zfsinfo_list(void); -void efizfs_set_preferred(EFI_HANDLE); #else -#define efizfs_set_preferred(x) #define efi_zfs_probe NULL #endif |