Commit 694fae55 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvme: always log traddr, restrict [host|sub]nqn to fabrics 



traddr is printed regardless of the transport type, as seeing the
address for fabrics is also beneficial.

hostnqn and subnqn are relevant only for fabrics, hence they are
suppressed for other types.

Change-Id: I342ef260be559751ee4869606e559d7b28852ae5
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26686


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent 8b97d24f

lib/nvme/nvme_internal.h

+6 −7
Original line number Diff line number Diff line
@@ -604,14 +604,13 @@ struct spdk_nvme_ns { 
	RB_ENTRY(spdk_nvme_ns)		node;

};



#define CTRLR_STRING(ctrlr) \

	(spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? \

	(ctrlr)->trid.subnqn : (ctrlr)->trid.traddr)



#define NVME_CTRLR_LOG_FMT "%s,%s,%u"

#define NVME_CTRLR_LOG_FMT "%s%s%s%s%s,%u"

#define NVME_CTRLR_LOG_ARGS(ctrlr) \

  (ctrlr)->opts.hostnqn, \

  CTRLR_STRING(ctrlr), \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? (ctrlr)->opts.hostnqn : "", \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? "," : "", \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? (ctrlr)->trid.subnqn : "", \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? "," : "", \

  (ctrlr)->trid.traddr, \

  (ctrlr)->cntlid



#define NVME_QPAIR_LOG_FMT "%u,%p"