Commit 0c00baf9 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

nvmf: move conf file parsing to nvmf_tgt app 



Change-Id: Iaf09d39046bceae023739d49e31804e150bb19d4
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 0b3bd6a9

app/nvmf_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CFLAGS += $(DPDK_INC) 
# TODO: remove this once NVMf has a public API header

CFLAGS += -I$(SPDK_ROOT_DIR)/lib



C_SRCS := nvmf_tgt.c

C_SRCS := conf.c nvmf_tgt.c



SPDK_LIBS = \

	$(SPDK_ROOT_DIR)/lib/nvmf/libspdk_nvmf.a \

lib/nvmf/conf.c→app/nvmf_tgt/conf.c

+2 −3
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ 
#include <rte_lcore.h>



#include "conf.h"

#include "nvmf_internal.h"

#include "subsystem.h"

#include "transport.h"

#include "nvmf/subsystem.h"

#include "nvmf/transport.h"

#include "spdk/conf.h"

#include "spdk/log.h"

lib/nvmf/conf.h→app/nvmf_tgt/conf.h

+0 −0

File moved.

View file

app/nvmf_tgt/nvmf_tgt.c

+14 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include <rte_memzone.h>

#include <rte_mempool.h>



#include "conf.h"



#include "spdk/event.h"



#include "nvmf/transport.h"
@@ -95,6 +97,18 @@ spdk_nvmf_startup(spdk_event_t event) 
{

	int rc;



	rc = spdk_nvmf_parse_conf();

	if (rc < 0) {

		SPDK_ERRLOG("spdk_nvmf_parse_conf() failed\n");

		goto initialize_error;

	}



	rc = spdk_nvmf_transport_init();

	if (rc <= 0) {

		SPDK_ERRLOG("Transport initialization failed\n");

		goto initialize_error;

	}



	/* start the rdma poller that will listen

	   on all available ports */

	rc = spdk_nvmf_acceptor_start();

lib/nvmf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 


CFLAGS += $(DPDK_INC)

LIBNAME = nvmf

C_SRCS = subsystem.c conf.c nvmf.c \

C_SRCS = subsystem.c nvmf.c \

	 request.c session.c transport.c \

	 direct.c