From 077fe1da6513ae10d25e5b59d4b8d95693be4666 Mon Sep 17 00:00:00 2001 From: Cunyin Chang Date: Wed, 10 Aug 2016 10:22:03 +0800 Subject: [PATCH] nvmf: Add nvmf subsystem dependence on bdev prepare for the virtual controller. Change-Id: I022e2c88cf8332c035b51e843d6b3ced4716df9c Signed-off-by: Cunyin Chang --- app/nvmf_tgt/Makefile | 10 +++++++++- lib/nvmf/nvmf.c | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index 85c636819..d24bd5eeb 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -33,6 +33,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = nvmf_tgt @@ -54,6 +55,13 @@ SPDK_LIBS = \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \ $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \ + $(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \ + $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \ + $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \ + $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \ + +LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ + $(COPY_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) @@ -62,7 +70,7 @@ LIBS += $(DPDK_LIB) all : $(APP) -$(APP) : $(OBJS) $(SPDK_LIBS) +$(APP) : $(OBJS) $(SPDK_LIBS) $(BLOCKDEV_MODULES) $(LINKER_MODULES) $(LINK_C) clean : diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 446ca092f..bb379f312 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -183,6 +183,7 @@ nvmf_tgt_subsystem_fini(void) } SPDK_SUBSYSTEM_REGISTER(nvmf, nvmf_tgt_subsystem_initialize, nvmf_tgt_subsystem_fini, NULL) +SPDK_SUBSYSTEM_DEPEND(nvmf, bdev) SPDK_TRACE_REGISTER_FN(nvmf_trace) {