Compile fixes since last rebase

Signed-off-by: Jorgen Lundman <lundman@lundman.net>
openzfsonosx · Mar 5, 2024 · 614e8d6 · 614e8d6
1 parent ab71a47
commit 614e8d6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/cmd/zpool/os/macos/zpool_vdev_os.c b/cmd/zpool/os/macos/zpool_vdev_os.c
@@ -199,3 +199,24 @@ after_zpool_upgrade(zpool_handle_t *zhp)
 {
 	(void) zhp;
 }
+
+int
+zpool_power_current_state(zpool_handle_t *zhp, char *vdev)
+{
+
+	(void) zhp;
+	(void) vdev;
+	/* Enclosure slot power not supported on macOS yet */
+	return (-1);
+}
+
+int
+zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on)
+{
+
+	(void) zhp;
+	(void) vdev;
+	(void) turn_on;
+	/* Enclosure slot power not supported on macOS yet */
+	return (ENOTSUP);
+}
diff --git a/include/os/macos/spl/sys/mod_os.h b/include/os/macos/spl/sys/mod_os.h
@@ -214,6 +214,12 @@ extern "C" {
 #define	param_set_max_auto_ashift_args(var) \
     CTLTYPE_U64, &var, sizeof (var), param_set_max_auto_ashift, "QU"
 
+#define	spa_taskq_read_param_set_args(var) \
+    CTLTYPE_STRING, NULL, 0, spa_taskq_read_param, "A"
+
+#define	spa_taskq_write_param_set_args(var)	\
+	CTLTYPE_STRING, NULL, 0, spa_taskq_write_param, "A"
+
 #define	fletcher_4_param_set_args(var) \
     CTLTYPE_STRING, NULL, 0, fletcher_4_param, "A"
 

diff --git a/lib/libspl/include/os/macos/string.h b/lib/libspl/include/os/macos/string.h
@@ -37,4 +37,6 @@ spl_strlcpy(char *__dst, const char *__source, size_t __size)
 #undef strlcpy
 #define	strlcpy spl_strlcpy
 
+#define	strerror_l(X, Y) strerror(X)
+
 #endif /* _LIBSPL_OSX_STRING_H */
diff --git a/lib/libzutil/os/macos/zutil_import_os.c b/lib/libzutil/os/macos/zutil_import_os.c
@@ -638,3 +638,10 @@ update_vdevs_config_dev_sysfs_path(nvlist_t *config)
 {
 	(void) config;
 }
+
+int
+zpool_disk_wait(const char *path)
+{
+	(void) path;
+	return (ENOTSUP);
+}
diff --git a/module/os/macos/Makefile.am b/module/os/macos/Makefile.am
@@ -151,6 +151,7 @@ zfs_common_SRCS = \
 	%D%/../../zfs/dbuf.c \
 	%D%/../../zfs/dbuf_stats.c \
 	%D%/../../zfs/ddt.c \
+	%D%/../../zfs/ddt_stats.c \
 	%D%/../../zfs/ddt_zap.c \
 	%D%/../../zfs/dmu.c \
 	%D%/../../zfs/dmu_diff.c \