From cda1d2cf110fdc33e62d3282a615f643bff3f45b Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 12 Oct 2020 06:19:39 -0400 Subject: [PATCH] build: remove unused references to conf library - Removed slew of conf.h includes - No longer require mk vars that include conf Signed-off-by: Tomasz Zawadzki Change-Id: Ica7e8e8bf1d4a5d0b0200bfe689aa13afd77bfaf Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4746 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- app/vhost/vhost.c | 1 - lib/event/rpc.c | 1 - lib/iscsi/init_grp.c | 1 - lib/iscsi/portal_grp.c | 1 - lib/iscsi/tgt_node.c | 1 - lib/nvmf/nvmf.c | 1 - mk/spdk.lib_deps.mk | 2 -- module/accel/idxd/accel_engine_idxd.c | 1 - module/bdev/compress/vbdev_compress.c | 1 - module/bdev/delay/vbdev_delay.c | 1 - module/bdev/ftl/bdev_ftl.c | 1 - test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c | 1 - test/app/fuzz/vhost_fuzz/vhost_fuzz.c | 1 - 13 files changed, 14 deletions(-) diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c index 4457edd7d..cffe8cb49 100644 --- a/app/vhost/vhost.c +++ b/app/vhost/vhost.c @@ -33,7 +33,6 @@ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/event.h" #include "spdk/vhost.h" diff --git a/lib/event/rpc.c b/lib/event/rpc.c index a42d5ebeb..8e4b7d618 100644 --- a/lib/event/rpc.c +++ b/lib/event/rpc.c @@ -33,7 +33,6 @@ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/env.h" #include "spdk/thread.h" #include "spdk/log.h" diff --git a/lib/iscsi/init_grp.c b/lib/iscsi/init_grp.c index 542544ca6..fc2428ca4 100644 --- a/lib/iscsi/init_grp.c +++ b/lib/iscsi/init_grp.c @@ -34,7 +34,6 @@ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/string.h" #include "spdk/log.h" diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index a8f54a22c..fa6661ec5 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -34,7 +34,6 @@ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/sock.h" #include "spdk/string.h" diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 9e44b97ec..1e9d947ee 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -34,7 +34,6 @@ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/sock.h" #include "spdk/scsi.h" diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 2a819e355..d30f315b3 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -35,7 +35,6 @@ #include "spdk/bdev.h" #include "spdk/bit_array.h" -#include "spdk/conf.h" #include "spdk/thread.h" #include "spdk/nvmf.h" #include "spdk/trace.h" diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk index 8d7b3c1c6..36ce4ae46 100644 --- a/mk/spdk.lib_deps.mk +++ b/mk/spdk.lib_deps.mk @@ -95,9 +95,7 @@ DEPDIRS-vhost = log util thread $(JSON_LIBS) bdev scsi # determine the unique dependencies of a given module. It is also grouped by directory. BDEV_DEPS = log util $(JSON_LIBS) bdev -BDEV_DEPS_CONF = $(BDEV_DEPS) conf BDEV_DEPS_THREAD = $(BDEV_DEPS) thread -BDEV_DEPS_CONF_THREAD = $(BDEV_DEPS) conf thread # module/blob DEPDIRS-blob_bdev := log thread bdev diff --git a/module/accel/idxd/accel_engine_idxd.c b/module/accel/idxd/accel_engine_idxd.c index 3dd5edd63..14c839806 100644 --- a/module/accel/idxd/accel_engine_idxd.c +++ b/module/accel/idxd/accel_engine_idxd.c @@ -40,7 +40,6 @@ #include "spdk_internal/idxd.h" #include "spdk/env.h" -#include "spdk/conf.h" #include "spdk/event.h" #include "spdk/thread.h" #include "spdk/idxd.h" diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c index 8de467fa7..59e7f5c52 100644 --- a/module/bdev/compress/vbdev_compress.c +++ b/module/bdev/compress/vbdev_compress.c @@ -37,7 +37,6 @@ #include "spdk/stdinc.h" #include "spdk/rpc.h" #include "spdk/env.h" -#include "spdk/conf.h" #include "spdk/endian.h" #include "spdk/string.h" #include "spdk/thread.h" diff --git a/module/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c index f155f5714..fafa0702c 100644 --- a/module/bdev/delay/vbdev_delay.c +++ b/module/bdev/delay/vbdev_delay.c @@ -36,7 +36,6 @@ #include "vbdev_delay.h" #include "spdk/rpc.h" #include "spdk/env.h" -#include "spdk/conf.h" #include "spdk/endian.h" #include "spdk/string.h" #include "spdk/thread.h" diff --git a/module/bdev/ftl/bdev_ftl.c b/module/bdev/ftl/bdev_ftl.c index 5eb7335bd..0978ff132 100644 --- a/module/bdev/ftl/bdev_ftl.c +++ b/module/bdev/ftl/bdev_ftl.c @@ -33,7 +33,6 @@ #include "spdk/stdinc.h" #include "spdk/bdev.h" -#include "spdk/conf.h" #include "spdk/env.h" #include "spdk/thread.h" #include "spdk/json.h" diff --git a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c index d7b1e54e2..27124eb4f 100644 --- a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c +++ b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c @@ -32,7 +32,6 @@ */ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/event.h" #include "spdk/util.h" #include "spdk/string.h" diff --git a/test/app/fuzz/vhost_fuzz/vhost_fuzz.c b/test/app/fuzz/vhost_fuzz/vhost_fuzz.c index 47dbfbc65..467eed780 100644 --- a/test/app/fuzz/vhost_fuzz/vhost_fuzz.c +++ b/test/app/fuzz/vhost_fuzz/vhost_fuzz.c @@ -32,7 +32,6 @@ */ #include "spdk/stdinc.h" -#include "spdk/conf.h" #include "spdk/env.h" #include "spdk/json.h" #include "spdk/event.h"