Commit e0a0f90b authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: don't enable adminq until we know discovery_ctrlr exists 



Fixes issue #1029.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I489dfc853804b005d385b1c51815f0e7f342b39b

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473237


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avataryidong0635 <dongx.yi@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ff93f0f9

lib/nvme/nvme_fabric.c

+1 −1
Original line number Diff line number Diff line
@@ -240,10 +240,10 @@ nvme_fabric_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, 
	discovery_opts.keep_alive_timeout_ms = 0;



	discovery_ctrlr = nvme_transport_ctrlr_construct(&probe_ctx->trid, &discovery_opts, NULL);

	nvme_qpair_set_state(discovery_ctrlr->adminq, NVME_QPAIR_ENABLED);

	if (discovery_ctrlr == NULL) {

		return -1;

	}

	nvme_qpair_set_state(discovery_ctrlr->adminq, NVME_QPAIR_ENABLED);



	/* TODO: this should be using the normal NVMe controller initialization process +1 */

	cc.raw = 0;