diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile index 09d6b52e45..e710504e96 100644 --- a/module/bdev/aio/Makefile +++ b/module/bdev/aio/Makefile @@ -42,4 +42,6 @@ C_SRCS = bdev_aio.c bdev_aio_rpc.c LIBNAME = bdev_aio LOCAL_SYS_LIBS = -laio +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile index 17d016c557..7ed2037753 100644 --- a/module/bdev/compress/Makefile +++ b/module/bdev/compress/Makefile @@ -44,4 +44,6 @@ C_SRCS = vbdev_compress.c vbdev_compress_rpc.c LIBNAME = bdev_compress CFLAGS += $(ENV_CFLAGS) +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile index 0fc97382cb..0af98701b8 100644 --- a/module/bdev/crypto/Makefile +++ b/module/bdev/crypto/Makefile @@ -43,4 +43,6 @@ CFLAGS += $(ENV_CFLAGS) C_SRCS = vbdev_crypto.c vbdev_crypto_rpc.c LIBNAME = bdev_crypto +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile index 2f4efa679e..80c5588faf 100644 --- a/module/bdev/delay/Makefile +++ b/module/bdev/delay/Makefile @@ -43,4 +43,6 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_delay.c vbdev_delay_rpc.c LIBNAME = bdev_delay +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile index 5a5ed2cfa2..3d4db1619e 100644 --- a/module/bdev/error/Makefile +++ b/module/bdev/error/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = vbdev_error.c vbdev_error_rpc.c LIBNAME = bdev_error +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile index b8fcaf2656..b720067e41 100644 --- a/module/bdev/ftl/Makefile +++ b/module/bdev/ftl/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS += bdev_ftl.c bdev_ftl_rpc.c LIBNAME = bdev_ftl +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile index 675b3dfa39..9014c3ff18 100644 --- a/module/bdev/gpt/Makefile +++ b/module/bdev/gpt/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = gpt.c vbdev_gpt.c LIBNAME = bdev_gpt +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile index 6cea0668c1..8411f160cd 100644 --- a/module/bdev/iscsi/Makefile +++ b/module/bdev/iscsi/Makefile @@ -47,4 +47,6 @@ CFLAGS += -Wno-error C_SRCS = bdev_iscsi.c bdev_iscsi_rpc.c LIBNAME = bdev_iscsi +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index 8692fab6f4..324f9306b3 100644 --- a/module/bdev/lvol/Makefile +++ b/module/bdev/lvol/Makefile @@ -42,4 +42,6 @@ C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c LIBNAME = bdev_lvol LOCAL_SYS_LIBS = -luuid +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile index f13b4a6028..1cc8f8949f 100644 --- a/module/bdev/malloc/Makefile +++ b/module/bdev/malloc/Makefile @@ -42,4 +42,6 @@ C_SRCS = bdev_malloc.c bdev_malloc_rpc.c LIBNAME = bdev_malloc LOCAL_SYS_LIBS = -luuid +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile index e6e1b6b074..774e82c596 100644 --- a/module/bdev/null/Makefile +++ b/module/bdev/null/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev_null.c bdev_null_rpc.c LIBNAME = bdev_null +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index c15f8c77bd..f7da320dd8 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/nvme/Makefile @@ -46,4 +46,6 @@ C_SRCS += vbdev_opal.c vbdev_opal_rpc.c endif LIBNAME = bdev_nvme +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index ffc178c774..496227bbef 100644 --- a/module/bdev/ocf/Makefile +++ b/module/bdev/ocf/Makefile @@ -44,6 +44,8 @@ C_SRCS = $(shell ls *.c) LIBNAME := bdev_ocf +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk OCF_ENV := $(call spdk_lib_list_to_static_libs,ocfenv) diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile index 42f077423d..6a7c472218 100644 --- a/module/bdev/passthru/Makefile +++ b/module/bdev/passthru/Makefile @@ -43,4 +43,6 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_passthru.c vbdev_passthru_rpc.c LIBNAME = bdev_passthru +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile index fb7f52e26d..05fee59a42 100644 --- a/module/bdev/pmem/Makefile +++ b/module/bdev/pmem/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev_pmem.c bdev_pmem_rpc.c LIBNAME = bdev_pmem +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile index 88d95c3baa..c996ee4601 100644 --- a/module/bdev/raid/Makefile +++ b/module/bdev/raid/Makefile @@ -47,4 +47,6 @@ endif LIBNAME = bdev_raid +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index d8d172f4ed..cf48a45cc9 100644 --- a/module/bdev/rbd/Makefile +++ b/module/bdev/rbd/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev_rbd.c bdev_rbd_rpc.c LIBNAME = bdev_rbd +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/rpc/Makefile b/module/bdev/rpc/Makefile index 284073738a..68b72921ee 100644 --- a/module/bdev/rpc/Makefile +++ b/module/bdev/rpc/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev_rpc.c LIBNAME = bdev_rpc +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile index 0d4d29203e..b873d27139 100644 --- a/module/bdev/split/Makefile +++ b/module/bdev/split/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = vbdev_split.c vbdev_split_rpc.c LIBNAME = bdev_split +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile index dc39b83d0a..8190bf8bb5 100644 --- a/module/bdev/uring/Makefile +++ b/module/bdev/uring/Makefile @@ -47,4 +47,6 @@ CFLAGS += -I$(CONFIG_URING_PATH) LDFLAGS += -L$(CONFIG_URING_PATH) endif +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile index 38948410c7..307ebfa3b7 100644 --- a/module/bdev/virtio/Makefile +++ b/module/bdev/virtio/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c LIBNAME = bdev_virtio +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile index e2eef1a630..c1a7c32001 100644 --- a/module/bdev/zone_block/Makefile +++ b/module/bdev/zone_block/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = vbdev_zone_block.c vbdev_zone_block_rpc.c LIBNAME = bdev_zone_block +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 2abdd67f7d..542ac26efd 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -130,6 +130,118 @@ function confirm_abi_deps() { name = SPDK_LOG_ACCEL_IDXD [suppress_variable] name = SPDK_LOG_ACCEL_IOAT +[suppress_variable] + name = SPDK_LOG_AIO +[suppress_variable] + name = SPDK_LOG_VBDEV_COMPRESS +[suppress_variable] + name = SPDK_LOG_CRYPTO +[suppress_variable] + name = SPDK_LOG_VBDEV_DELAY +[suppress_function] + name = spdk_vbdev_error_create +[suppress_function] + name = spdk_vbdev_error_delete +[suppress_function] + name = spdk_vbdev_error_inject_error +[suppress_variable] + name = SPDK_LOG_BDEV_FTL +[suppress_variable] + name = SPDK_LOG_GPT_PARSE +[suppress_variable] + name = SPDK_LOG_VBDEV_GPT +[suppress_function] + name = spdk_gpt_parse_mbr +[suppress_function] + name = spdk_gpt_parse_partition_table +[suppress_variable] + name = SPDK_LOG_ISCSI_INIT +[suppress_variable] + name = SPDK_LOG_LVOL_RPC +[suppress_variable] + name = SPDK_LOG_VBDEV_LVOL +[suppress_variable] + name = SPDK_LOG_BDEV_MALLOC +[suppress_variable] + name = SPDK_LOG_BDEV_NULL +[suppress_variable] + name = SPDK_LOG_BDEV_NVME +[suppress_function] + name = spdk_bdev_nvme_create +[suppress_function] + name = spdk_bdev_nvme_delete +[suppress_function] + name = spdk_bdev_nvme_get_ctrlr +[suppress_function] + name = spdk_bdev_nvme_get_io_qpair +[suppress_function] + name = spdk_bdev_nvme_get_opts +[suppress_function] + name = spdk_bdev_nvme_set_hotplug +[suppress_function] + name = spdk_bdev_nvme_set_opts +[suppress_function] + name = spdk_vbdev_opal_create +[suppress_function] + name = spdk_vbdev_opal_destruct +[suppress_function] + name = spdk_vbdev_opal_enable_new_user +[suppress_function] + name = spdk_vbdev_opal_get_info_from_bdev +[suppress_function] + name = spdk_vbdev_opal_set_lock_state +[suppress_variable] + name = SPDK_LOG_BDEV_OCSSD +[suppress_variable] + name = SPDK_LOG_VBDEV_OPAL +[suppress_variable] + name = SPDK_LOG_OCFCTX +[suppress_variable] + name = SPDK_LOG_VBDEV_PASSTHRU +[suppress_variable] + name = SPDK_LOG_BDEV_PMEM +[suppress_function] + name = spdk_create_pmem_disk +[suppress_function] + name = spdk_delete_pmem_disk +[suppress_variable] + name = SPDK_LOG_BDEV_RAID +[suppress_variable] + name = SPDK_LOG_BDEV_RAID0 +[suppress_variable] + name = SPDK_LOG_BDEV_RAID5 +[suppress_variable] + name = SPDK_LOG_RAID_RPC +[suppress_variable] + name = SPDK_LOG_BDEV_RBD +[suppress_function] + name = spdk_bdev_rbd_create +[suppress_function] + name = spdk_bdev_rbd_delete +[suppress_function] + name = spdk_bdev_rbd_dup_config +[suppress_function] + name = spdk_bdev_rbd_free_config +[suppress_function] + name = spdk_bdev_rbd_resize +[suppress_variable] + name = SPDK_LOG_VBDEV_SPLIT +[suppress_function] + name = spdk_vbdev_split_destruct +[suppress_function] + name = spdk_vbdev_split_get_part_base +[suppress_variable] + name = SPDK_LOG_URING +[suppress_variable] + name = SPDK_LOG_VIRTIO +[suppress_variable] + name = SPDK_LOG_VIRTIO_BLK +[suppress_variable] + name = SPDK_LOG_VBDEV_ZONE_BLOCK +[suppress_function] + name = spdk_vbdev_zone_block_create +[suppress_function] + name = spdk_vbdev_zone_block_delete EOF for object in "$libdir"/libspdk_*.so; do