Commit 3f80d551 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

CONFIG: rename CONFIG_NVMF to CONFIG_RDMA 



The NVMf target is being refactored to split the RDMA transport-specific
code into its own file.  Once this is complete, we should be able to
plug in other transports and build the NVMf target without any RDMA
dependency if desired.

To enable this, change the CONFIG option to RDMA; it still controls
whether the whole NVMf target is built for now, but once the RDMA
dependency is actually made optional, we will be able to build the
generic NVMf target code without libibverbs installed.

Change-Id: I8cd90a9aaa85dcefcc9b0f8f2e7b6af21958b2a8
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 51701f00

CONFIG

+2 −2
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ CONFIG_FIO_PLUGIN?=n 
# which is required for building the SPDK FIO plugin.

FIO_SOURCE_DIR?=/usr/src/fio



# Build NVMf (NVMe over Fabrics) target.

# Enable RDMA support for the NVMf target.

# Requires ibverbs development libraries.

CONFIG_NVMF?=n
 
CONFIG_RDMA?=n

app/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



DIRS-y += trace

DIRS-$(CONFIG_NVMF) += nvmf_tgt

DIRS-$(CONFIG_RDMA) += nvmf_tgt



.PHONY: all clean $(DIRS-y)

doc/nvmf/getting_started.txt

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ apt-get install libibverbs-dev librdmacm-dev 
\endverbatim



Then build SPDK with the NVMf target enabled, either by editing CONFIG

to enable CONFIG_NVMF or enabling it on the `make` command line:

to enable CONFIG_RDMA or enabling it on the `make` command line:



\verbatim

make CONFIG_NVMF=y <other config parameters>

make CONFIG_RDMA=y <other config parameters>

\endverbatim



\section nvmf_config Configuring NVMf

lib/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



DIRS-y += conf cunit event json jsonrpc log memory rpc trace util nvme ioat



DIRS-$(CONFIG_NVMF) += nvmf

DIRS-y += conf cunit event json jsonrpc log memory rpc trace util nvme nvmf ioat



.PHONY: all clean $(DIRS-y)

lib/nvmf/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 


CFLAGS += $(DPDK_INC)

LIBNAME = nvmf

C_SRCS = rdma.c port.c conn.c controller.c \

C_SRCS = port.c conn.c controller.c \

	 host.c subsystem.c conf.c \

	 nvmf.c request.c session.c



C_SRCS-$(CONFIG_RDMA) += rdma.c



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk