Commit 7b2a6b05 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

nvmf: add public API to get subsystem serial number 



Change-Id: I61b6579e8698d16e5a8ab74d304af9ea53f9dce4
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/363307


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 83da13f1

app/nvmf_tgt/nvmf_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct nvmf_tgt_subsystem *tg 
		} else {

			int i;

			spdk_json_write_name(w, "serial_number");

			spdk_json_write_string(w, subsystem->dev.virt.sn);

			spdk_json_write_string(w, spdk_nvmf_subsystem_get_sn(subsystem));

			spdk_json_write_name(w, "namespaces");

			spdk_json_write_array_begin(w);

			for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

include/spdk/nvmf.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ void spdk_nvmf_subsystem_poll(struct spdk_nvmf_subsystem *subsystem); 


int spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bdev *bdev);



const char *spdk_nvmf_subsystem_get_sn(const struct spdk_nvmf_subsystem *subsystem);



int spdk_nvmf_subsystem_set_sn(struct spdk_nvmf_subsystem *subsystem, const char *sn);



const char *spdk_nvmf_subsystem_get_nqn(struct spdk_nvmf_subsystem *subsystem);

lib/nvmf/subsystem.c

+10 −0
Original line number Diff line number Diff line
@@ -409,6 +409,16 @@ spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bd 
	return 0;

}



const char *

spdk_nvmf_subsystem_get_sn(const struct spdk_nvmf_subsystem *subsystem)

{

	if (subsystem->mode != NVMF_SUBSYSTEM_MODE_VIRTUAL) {

		return NULL;

	}



	return subsystem->dev.virt.sn;

}



int

spdk_nvmf_subsystem_set_sn(struct spdk_nvmf_subsystem *subsystem, const char *sn)

{

lib/nvmf/virtual.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ nvmf_virtual_ctrlr_get_data(struct spdk_nvmf_session *session) 
	memset(&session->vcdata, 0, sizeof(struct spdk_nvme_ctrlr_data));

	spdk_strcpy_pad(session->vcdata.fr, FW_VERSION, sizeof(session->vcdata.fr), ' ');

	spdk_strcpy_pad(session->vcdata.mn, MODEL_NUMBER, sizeof(session->vcdata.mn), ' ');

	spdk_strcpy_pad(session->vcdata.sn, subsys->dev.virt.sn, sizeof(session->vcdata.sn), ' ');

	spdk_strcpy_pad(session->vcdata.sn, spdk_nvmf_subsystem_get_sn(subsys),

			sizeof(session->vcdata.sn), ' ');

	session->vcdata.rab = 6;

	session->vcdata.ver.bits.mjr = 1;

	session->vcdata.ver.bits.mnr = 2;

test/lib/nvmf/virtual/virtual_ut.c

+7 −0
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ const char *spdk_nvmf_subsystem_get_nqn(struct spdk_nvmf_subsystem *subsystem) 
	return NULL;

}



const char *

spdk_nvmf_subsystem_get_sn(const struct spdk_nvmf_subsystem *subsystem)

{

	abort();

	return NULL;

}



void spdk_bdev_io_get_nvme_status(const struct spdk_bdev_io *bdev_io, int *sct, int *sc)

{

}