Commit 2484d0d1 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

bdev/nvme: write TransportID to config file 



It was writing TransportId (lower-case d) instead.

While here, fix similar issue in etc/spdk/nvmf.conf.in.

lib/conf uses strcasecmp(), meaning TransportID and
TransportId are effectively the same, but it's better
to reduce confusion and just use the same in all places.

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

Reviewed-on: https://review.gerrithub.io/426001


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 4a7240a7

etc/spdk/nvmf.conf.in

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ 
  # other sections in the configuration file. For NVMe devices, a namespace

  # is automatically appended to each name in the format <YourName>nY, where

  # Y is the NSID (starts at 1).

  TransportId "trtype:PCIe traddr:0000:00:00.0" Nvme0

  TransportId "trtype:PCIe traddr:0000:01:00.0" Nvme1

  TransportID "trtype:PCIe traddr:0000:00:00.0" Nvme0

  TransportID "trtype:PCIe traddr:0000:01:00.0" Nvme1



  # The number of attempts per I/O when an I/O fails. Do not include

  # this key to get the default behavior.

lib/bdev/nvme/bdev_nvme.c

+3 −3
Original line number Diff line number Diff line
@@ -1669,7 +1669,7 @@ bdev_nvme_get_spdk_running_config(FILE *fp) 
		}



		if (nvme_ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE) {

			fprintf(fp, "TransportId \"trtype:%s traddr:%s\" %s\n",

			fprintf(fp, "TransportID \"trtype:%s traddr:%s\" %s\n",

				trtype,

				nvme_ctrlr->trid.traddr, nvme_ctrlr->name);

		} else {
@@ -1678,12 +1678,12 @@ bdev_nvme_get_spdk_running_config(FILE *fp) 
			adrfam = spdk_nvme_transport_id_adrfam_str(nvme_ctrlr->trid.adrfam);



			if (adrfam) {

				fprintf(fp, "TransportId \"trtype:%s adrfam:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n",

				fprintf(fp, "TransportID \"trtype:%s adrfam:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n",

					trtype,	adrfam,

					nvme_ctrlr->trid.traddr, nvme_ctrlr->trid.trsvcid,

					nvme_ctrlr->trid.subnqn, nvme_ctrlr->name);

			} else {

				fprintf(fp, "TransportId \"trtype:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n",

				fprintf(fp, "TransportID \"trtype:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n",

					trtype,

					nvme_ctrlr->trid.traddr, nvme_ctrlr->trid.trsvcid,

					nvme_ctrlr->trid.subnqn, nvme_ctrlr->name);