Commit 4c0eaac4 authored by Ben Walker's avatar Ben Walker
Browse files

bdev: Create a separate bdev subsystem library 



Much like bdev modules inside the bdev directory,
add a subsystems directory inside of event. The subsystem
specific code for the bdev library is placed in to
a separate library in that directory, breaking the
strict dependency of the bdev library on the event subsystem
code.

Change-Id: I255941b823a9ec3e2d62f22a586414949d8ff5ad
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/365055


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent a0a41eef

app/iscsi_tgt/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 


C_SRCS := iscsi_tgt.c



SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf

SPDK_LIB_LIST = event_bdev

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf

SPDK_LIB_LIST += util log log_rpc event app_rpc



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

app/nvmf_tgt/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ CFLAGS += $(ENV_CFLAGS) 


C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c



SPDK_LIB_LIST = nvmf event log trace conf util bdev copy rpc jsonrpc json

SPDK_LIB_LIST = event_bdev

SPDK_LIB_LIST += nvmf event log trace conf util bdev copy rpc jsonrpc json

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

app/vhost/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ CFLAGS += $(ENV_CFLAGS) 


C_SRCS := vhost.c



SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev scsi net copy trace conf

SPDK_LIB_LIST = event_bdev

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi net copy trace conf

SPDK_LIB_LIST += util log log_rpc event app_rpc

SPDK_LIB_LIST += vhost rte_vhost

include/spdk/bdev.h

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ struct spdk_bdev_io_stat { 
	uint64_t num_write_ops;

};



void spdk_bdev_initialize(void);

int spdk_bdev_finish(void);

void spdk_bdev_config_text(FILE *fp);



struct spdk_bdev *spdk_bdev_get_by_name(const char *bdev_name);



struct spdk_bdev *spdk_bdev_first(void);

lib/bdev/bdev.c

+3 −5
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ spdk_bdev_module_get_max_ctx_size(void) 
	return max_bdev_module_size;

}



static void

void

spdk_bdev_config_text(FILE *fp)

{

	struct spdk_bdev_module_if *bdev_module;
@@ -344,7 +344,7 @@ spdk_vbdev_module_init_next(int rc) 
	}

}



static void

void

spdk_bdev_initialize(void)

{

	int cache_size;
@@ -404,7 +404,7 @@ end: 
	spdk_bdev_module_init_next(rc);

}



static int

int

spdk_bdev_finish(void)

{

	struct spdk_bdev_module_if *bdev_module;
@@ -1414,5 +1414,3 @@ spdk_vbdev_module_list_add(struct spdk_bdev_module_if *vbdev_module) 
{

	TAILQ_INSERT_TAIL(&g_bdev_mgr.vbdev_modules, vbdev_module, tailq);

}
 
SPDK_SUBSYSTEM_REGISTER(bdev, spdk_bdev_initialize, spdk_bdev_finish, spdk_bdev_config_text)

SPDK_SUBSYSTEM_DEPEND(bdev, copy)