diff options
| author | Toomas Soome <tsoome@me.com> | 2020-07-03 18:48:16 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-07-08 21:50:05 +0300 |
| commit | 7fc77f3f3f63424c569601711f173702dbfd5c45 (patch) | |
| tree | 45ee37250eabf57caeb55327e4d293f016fef548 /usr/src | |
| parent | 1c0fc4547783fdfd7365d5d483e2750915523d44 (diff) | |
| download | illumos-joyent-7fc77f3f3f63424c569601711f173702dbfd5c45.tar.gz | |
12927 loader: move zfs_boot_args to bootargs.h
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/lib/libstand/zfs/libzfs.h | 31 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/common/bootargs.h | 18 |
2 files changed, 19 insertions, 30 deletions
diff --git a/usr/src/boot/lib/libstand/zfs/libzfs.h b/usr/src/boot/lib/libstand/zfs/libzfs.h index a8430290f1..7a6fcf57ea 100644 --- a/usr/src/boot/lib/libstand/zfs/libzfs.h +++ b/usr/src/boot/lib/libstand/zfs/libzfs.h @@ -25,7 +25,7 @@ */ #ifndef _BOOT_LIBZFS_H_ -#define _BOOT_LIBZFS_H_ +#define _BOOT_LIBZFS_H_ #define ZFS_MAXNAMELEN 256 @@ -38,31 +38,14 @@ struct zfs_devdesc { uint64_t root_guid; }; -struct zfs_boot_args -{ - uint32_t size; - uint32_t reserved; - uint64_t pool; - uint64_t root; - uint64_t primary_pool; - uint64_t primary_vdev; -}; - -int zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, - const char **path); -char *zfs_bootfs(void *vdev); -char *zfs_fmtdev(void *vdev); -int zfs_probe_dev(const char *devname, uint64_t *pool_guid); -int zfs_list(const char *name); +int zfs_parsedev(struct zfs_devdesc *, const char *, const char **); +char *zfs_bootfs(void *); +char *zfs_fmtdev(void *); +int zfs_probe_dev(const char *, uint64_t *); +int zfs_list(const char *); uint64_t ldi_get_size(void *); -#ifdef __FreeBSD__ -void init_zfs_bootenv(char *currdev); -int zfs_bootenv(const char *name); -int zfs_belist_add(const char *name, uint64_t __unused); -int zfs_set_env(void); -#endif extern struct devsw zfs_dev; extern struct fs_ops zfs_fsops; -#endif /*_BOOT_LIBZFS_H_*/ +#endif /* _BOOT_LIBZFS_H_ */ diff --git a/usr/src/boot/sys/boot/i386/common/bootargs.h b/usr/src/boot/sys/boot/i386/common/bootargs.h index 4768d68ae1..0bd446e18e 100644 --- a/usr/src/boot/sys/boot/i386/common/bootargs.h +++ b/usr/src/boot/sys/boot/i386/common/bootargs.h @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 2012 Andriy Gapon <avg@FreeBSD.org> * All rights reserved. * @@ -11,8 +11,6 @@ * implied warranties, including, without limitation, the implied * warranties of merchantability and fitness for a particular * purpose. - * - * $FreeBSD$ */ #ifndef _BOOT_I386_ARGS_H_ @@ -43,8 +41,7 @@ #ifndef __ASSEMBLER__ -struct bootargs -{ +struct bootargs { uint32_t howto; uint32_t bootdev; uint32_t bootflags; @@ -64,6 +61,15 @@ struct bootargs */ }; -#endif /*__ASSEMBLER__*/ +struct zfs_boot_args { + uint32_t size; + uint32_t reserved; + uint64_t pool; + uint64_t root; + uint64_t primary_pool; + uint64_t primary_vdev; +}; + +#endif /* __ASSEMBLER__ */ #endif /* !_BOOT_I386_ARGS_H_ */ |