Commit 8d40e9da authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Dump alternate trids for get_controllers RPC 



Alternate trids were not included in the bdev_nvme_get_controllers RPC.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I9e963533d6a017ee79d9bdb6b08fafb25b314dba
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16742


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 93d1d901

module/bdev/nvme/bdev_nvme.c

+15 −0
Original line number Diff line number Diff line
@@ -2932,6 +2932,7 @@ nvme_ctrlr_info_json(struct spdk_json_write_ctx *w, struct nvme_ctrlr *nvme_ctrl 
	struct spdk_nvme_transport_id *trid;

	const struct spdk_nvme_ctrlr_opts *opts;

	const struct spdk_nvme_ctrlr_data *cdata;

	struct nvme_path_id *path_id;



	spdk_json_write_object_begin(w);
@@ -2951,6 +2952,20 @@ nvme_ctrlr_info_json(struct spdk_json_write_ctx *w, struct nvme_ctrlr *nvme_ctrl 
	nvme_bdev_dump_trid_json(trid, w);

	spdk_json_write_object_end(w);



	path_id = TAILQ_NEXT(nvme_ctrlr->active_path_id, link);

	if (path_id != NULL) {

		spdk_json_write_named_array_begin(w, "alternate_trids");

		do {

			trid = &path_id->trid;

			spdk_json_write_object_begin(w);

			nvme_bdev_dump_trid_json(trid, w);

			spdk_json_write_object_end(w);



			path_id = TAILQ_NEXT(path_id, link);

		} while (path_id != NULL);

		spdk_json_write_array_end(w);

	}



	cdata = spdk_nvme_ctrlr_get_data(nvme_ctrlr->ctrlr);

	spdk_json_write_named_uint16(w, "cntlid", cdata->cntlid);