Commit 4937ff7b authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvme: add hostnqn to nvme logs 



Might be useful in multipath scenarios.

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


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent 57ae7e39

lib/nvme/nvme_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ struct spdk_nvme_ns { 


#define NVME_CTRLR_LOG(type, ctrlr, format, ...) do { \

	if ((ctrlr)) { \

		SPDK_##type##LOG("[%s,%u] " format, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__); \

		SPDK_##type##LOG("[%s,%s,%u] " format, (ctrlr)->opts.hostnqn, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__); \

	} else { \

		SPDK_##type##LOG("[null ctrlr] " format, ##__VA_ARGS__); \

	} \
@@ -617,7 +617,7 @@ struct spdk_nvme_ns { 


#define NVME_CTRLR_LOG2(type, component, ctrlr, format, ...) do { \

	if ((ctrlr)) { \

		SPDK_##type##LOG(component, "[%s,%u] " format, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__); \

		SPDK_##type##LOG(component, "[%s,%s,%u] " format, (ctrlr)->opts.hostnqn, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__); \

	} else { \

		SPDK_##type##LOG(component, "[null ctrlr] " format, ##__VA_ARGS__); \

	} \
@@ -635,7 +635,7 @@ struct spdk_nvme_ns { 
	} else if (!(qpair)->ctrlr) { \

		SPDK_##type##LOG("[null ctrlr,%u,%p] " format, (qpair)->id, (qpair), ##__VA_ARGS__); \

	} else { \

		SPDK_##type##LOG("[%s,%u,%u,%p] " format, CTRLR_STRING((qpair)->ctrlr), (qpair)->ctrlr->cntlid, (qpair)->id, (qpair), ##__VA_ARGS__); \

		SPDK_##type##LOG("[%s,%s,%u,%u,%p] " format, (qpair)->ctrlr->opts.hostnqn, CTRLR_STRING((qpair)->ctrlr), (qpair)->ctrlr->cntlid, (qpair)->id, (qpair), ##__VA_ARGS__); \

	} \

} while (0)
@@ -645,7 +645,7 @@ struct spdk_nvme_ns { 
	} else if (!(qpair)->ctrlr) { \

		SPDK_##type##LOG(component, "[null ctrlr,%u,%p] " format, (qpair)->id, (qpair), ##__VA_ARGS__); \

	} else { \

		SPDK_##type##LOG(component, "[%s,%u,%u,%p] " format, CTRLR_STRING((qpair)->ctrlr), (qpair)->ctrlr->cntlid, (qpair)->id, (qpair), ##__VA_ARGS__); \

		SPDK_##type##LOG(component, "[%s,%s,%u,%u,%p] " format, (qpair)->ctrlr->opts.hostnqn, CTRLR_STRING((qpair)->ctrlr), (qpair)->ctrlr->cntlid, (qpair)->id, (qpair), ##__VA_ARGS__); \

	} \

} while (0)