Commit d67021b0 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: merge nvmf.c and framework.c 



There is no logical split between nvmf.c and framework.c, so combine
them and drop nvmf.c.

Change-Id: I91230c01ed7f171bfed04456b0bfcf0e7ddbc263
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent ca4932f9

lib/nvmf/Makefile

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


CFLAGS += $(DPDK_INC)

LIBNAME = nvmf

C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c nvmf.c \

C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c \

	 rdma.c port.c conn.c controller.c \

	 init_grp.c subsystem_grp.c conf.c \

	 framework.c session.c

lib/nvmf/framework.c

+19 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "subsystem_grp.h"

#include "spdk/trace.h"



SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)



#define MAX_SUBSYSTEMS 4
@@ -343,6 +344,24 @@ nvmf_tgt_subsystem_fini(void) 
	return 0;

}



int

nvmf_initialize(void)

{

	if (request_mempool == NULL) {

		fprintf(stderr, "NVMf application has not created request mempool!\n");

		return -1;

	}



	return 0;

}



void

nvmf_shutdown(void)

{

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_shutdown\n");



	spdk_nvmf_shutdown_nvme();

}



SPDK_SUBSYSTEM_REGISTER(nvmf, nvmf_tgt_subsystem_initialize, nvmf_tgt_subsystem_fini, NULL)

lib/nvmf/nvmf.c

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include <arpa/inet.h>



#include "conn.h"

#include "controller.h"

#include "port.h"

#include "init_grp.h"

#include "nvmf_internal.h"

#include "nvmf.h"

#include "rdma.h"

#include "subsystem_grp.h"

#include "spdk/conf.h"

#include "spdk/log.h"

#include "spdk/pci.h"

#include "spdk/trace.h"



SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)



extern struct rte_mempool *request_mempool;



int

nvmf_initialize(void)

{

	if (request_mempool == NULL) {

		fprintf(stderr, "NVMf application has not created request mempool!\n");

		return -1;

	}



	return 0;

}



void

nvmf_shutdown(void)

{

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_shutdown\n");



	spdk_nvmf_shutdown_nvme();

}