From 17ae1f40c51b23fcd8f42c8f4e099bea46bb7122 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 23 Apr 2020 02:07:18 +0900 Subject: [PATCH] lib/iscsi: add a map file g_spdk_iscsi_opts is encapsulated and not directly accessed by outside of iSCSI library. So do not add it to the map file of iSCSI library and remove it from the map file of the shared build Signed-off-by: Shuhei Matsumoto Change-Id: Ib9202891813208329ec6b3b0e076e4f608a38ef9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1895 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk --- lib/iscsi/Makefile | 2 ++ lib/iscsi/spdk_iscsi.map | 11 +++++++++++ shared_lib/spdk.map | 1 - test/make/check_so_deps.sh | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 lib/iscsi/spdk_iscsi.map diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile index 9689000f8..51e9fca4e 100644 --- a/lib/iscsi/Makefile +++ b/lib/iscsi/Makefile @@ -46,4 +46,6 @@ C_SRCS = conn.c \ LIBNAME = iscsi LOCAL_SYS_LIBS = -lcrypto +SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_iscsi.map) + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/iscsi/spdk_iscsi.map b/lib/iscsi/spdk_iscsi.map new file mode 100644 index 000000000..0475a800d --- /dev/null +++ b/lib/iscsi/spdk_iscsi.map @@ -0,0 +1,11 @@ +{ + global: + + # Functions used by other SPDK libraries + spdk_iscsi_init; + spdk_iscsi_fini; + spdk_iscsi_config_text; + spdk_iscsi_config_json; + + local: *; +}; diff --git a/shared_lib/spdk.map b/shared_lib/spdk.map index 7f980eba5..ecc9119ff 100644 --- a/shared_lib/spdk.map +++ b/shared_lib/spdk.map @@ -5,7 +5,6 @@ rte_vhost_*; virt*; SPDK_LOG*; - g_spdk_iscsi_opts; _spdk_trace_record; g_trace_histories; diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 3f1014f6e..9c0e82452 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -39,6 +39,8 @@ function confirm_abi_deps() { name = SPDK_LOG_FTL_CORE [suppress_variable] name = SPDK_LOG_FTL_INIT +[suppress_variable] + name = SPDK_LOG_ISCSI EOF