]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Start to reduce the number of #ifdef EFI_ZFS_BOOT
authorimp <imp@FreeBSD.org>
Sat, 20 Apr 2019 05:31:56 +0000 (05:31 +0000)
committerimp <imp@FreeBSD.org>
Sat, 20 Apr 2019 05:31:56 +0000 (05:31 +0000)
commitc923125e2aa5b80fcd027918c94ac0287a012b7c
tree2332b8188fd66610b3e36eea30d1850cb2897cf9
parenta7e393156a4e5a931c5abeaabf62ef2cbdb118ed
Start to reduce the number of #ifdef EFI_ZFS_BOOT

There's a number of EFI_ZFS_BOOT #ifdefs that aren't needed, or can be
eliminated with some trivial #defines. Remove the EFI_ZFS_BOOT ifdefs
that aren't needed. Replace libzfs.h include which is not safe to
include without EFI_ZFS_BOOT with efizfs.h which is and now
conditionally included libzfs.h. Define efizfs_set_preferred away
and define efi_zfs_probe to NULL when ZFS is compiled out.
stand/efi/include/efizfs.h
stand/efi/libefi/devicename.c
stand/efi/loader/conf.c
stand/efi/loader/main.c