From c4fee1e970ab48f45848f3653a024382dfd9cdfa Mon Sep 17 00:00:00 2001 From: Pawel Wodkowski Date: Thu, 27 Sep 2018 21:38:15 +0200 Subject: [PATCH] mk: don't use '-include spdk/config.h' Each file that need to check SPDK_CONFIG_* options need to include spdk/config.h explicitly. Change-Id: If9f2a91ac4c2b1a300dcf88ec3e2a12714ad344a Signed-off-by: Pawel Wodkowski Reviewed-on: https://review.gerrithub.io/427221 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Chandler-Test-Pool: SPDK Automated Test System --- app/spdk_tgt/spdk_tgt.c | 1 + lib/bdev/bdev.c | 1 + lib/bdev/nvme/bdev_nvme.c | 1 + lib/bdev/vtune.c | 1 + lib/nvme/nvme_internal.h | 1 + lib/nvmf/rdma.c | 1 + lib/nvmf/transport.c | 1 + mk/spdk.common.mk | 2 -- test/unit/lib/bdev/bdev.c/bdev_ut.c | 1 + test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 1 + test/unit/lib/bdev/part.c/part_ut.c | 1 + 11 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/spdk_tgt/spdk_tgt.c b/app/spdk_tgt/spdk_tgt.c index 1302dc74e..1c93f58a8 100644 --- a/app/spdk_tgt/spdk_tgt.c +++ b/app/spdk_tgt/spdk_tgt.c @@ -33,6 +33,7 @@ #include "spdk/stdinc.h" +#include "spdk/config.h" #include "spdk/env.h" #include "spdk/event.h" #include "spdk/vhost.h" diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 3435df32c..5a741c004 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -36,6 +36,7 @@ #include "spdk/bdev.h" #include "spdk/conf.h" +#include "spdk/config.h" #include "spdk/env.h" #include "spdk/event.h" #include "spdk/thread.h" diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index 9b1bd0e40..0b47b539b 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -35,6 +35,7 @@ #include "bdev_nvme.h" +#include "spdk/config.h" #include "spdk/conf.h" #include "spdk/endian.h" #include "spdk/bdev.h" diff --git a/lib/bdev/vtune.c b/lib/bdev/vtune.c index 75d6c8f4a..2cb48826e 100644 --- a/lib/bdev/vtune.c +++ b/lib/bdev/vtune.c @@ -31,6 +31,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "spdk/config.h" #if SPDK_CONFIG_VTUNE /* Disable warnings triggered by the VTune code */ diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 4ecc6ccb0..c2dd7588c 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -34,6 +34,7 @@ #ifndef __NVME_INTERNAL_H__ #define __NVME_INTERNAL_H__ +#include "spdk/config.h" #include "spdk/likely.h" #include "spdk/stdinc.h" diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index c1007216f..b663a4900 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -40,6 +40,7 @@ #include "nvmf_internal.h" #include "transport.h" +#include "spdk/config.h" #include "spdk/assert.h" #include "spdk/thread.h" #include "spdk/nvmf.h" diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c index 0e351e213..af4660c96 100644 --- a/lib/nvmf/transport.c +++ b/lib/nvmf/transport.c @@ -36,6 +36,7 @@ #include "nvmf_internal.h" #include "transport.h" +#include "spdk/config.h" #include "spdk/log.h" #include "spdk/nvmf.h" #include "spdk/queue.h" diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index 8a67932e4..b4d17d83d 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -77,8 +77,6 @@ ifeq ($(TARGET_MACHINE),x86_64) COMMON_CFLAGS += -march=native endif -COMMON_CFLAGS += -include $(SPDK_ROOT_DIR)/include/spdk/config.h - ifeq ($(CONFIG_WERROR), y) COMMON_CFLAGS += -Werror endif diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index ae33c4f39..e28885e2c 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -36,6 +36,7 @@ #include "common/lib/test_env.c" #include "unit/lib/json_mock.c" +#include "spdk/config.h" /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */ #undef SPDK_CONFIG_VTUNE diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index 92c6cfa77..09740fa9e 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -37,6 +37,7 @@ #include "common/lib/ut_multithread.c" #include "unit/lib/json_mock.c" +#include "spdk/config.h" /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */ #undef SPDK_CONFIG_VTUNE diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c index aa0cbeff7..fd251f4c3 100644 --- a/test/unit/lib/bdev/part.c/part_ut.c +++ b/test/unit/lib/bdev/part.c/part_ut.c @@ -36,6 +36,7 @@ #include "common/lib/test_env.c" #include "unit/lib/json_mock.c" +#include "spdk/config.h" /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */ #undef SPDK_CONFIG_VTUNE