Commit 7944bbea authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf: save discovery subsystem listener configuration 



Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I7b0e32a34657d480a61565cec64c33f35043aa2a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20902


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 020c4e11

lib/nvmf/nvmf.c

+15 −7
Original line number Diff line number Diff line
@@ -549,20 +549,16 @@ spdk_nvmf_get_next_tgt(struct spdk_nvmf_tgt *prev) 
}



static void

nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w,

nvmf_write_nvme_subsystem_config(struct spdk_json_write_ctx *w,

				 struct spdk_nvmf_subsystem *subsystem)

{

	struct spdk_nvmf_host *host;

	struct spdk_nvmf_subsystem_listener *listener;

	const struct spdk_nvme_transport_id *trid;

	struct spdk_nvmf_ns *ns;

	struct spdk_nvmf_ns_opts ns_opts;

	uint32_t max_namespaces;

	struct spdk_nvmf_transport *transport;



	if (spdk_nvmf_subsystem_get_type(subsystem) != SPDK_NVMF_SUBTYPE_NVME) {

		return;

	}

	assert(spdk_nvmf_subsystem_get_type(subsystem) == SPDK_NVMF_SUBTYPE_NVME);



	/* { */

	spdk_json_write_object_begin(w);
@@ -661,6 +657,19 @@ nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w, 
		/* } */

		spdk_json_write_object_end(w);

	}

}



static void

nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w,

				 struct spdk_nvmf_subsystem *subsystem)

{

	struct spdk_nvmf_subsystem_listener *listener;

	struct spdk_nvmf_transport *transport;

	const struct spdk_nvme_transport_id *trid;



	if (spdk_nvmf_subsystem_get_type(subsystem) == SPDK_NVMF_SUBTYPE_NVME) {

		nvmf_write_nvme_subsystem_config(w, subsystem);

	}



	for (listener = spdk_nvmf_subsystem_get_first_listener(subsystem); listener != NULL;

	     listener = spdk_nvmf_subsystem_get_next_listener(subsystem, listener)) {
@@ -690,7 +699,6 @@ nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w, 
		/* } */

		spdk_json_write_object_end(w);

	}



}



void