Commit 35837ada authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

nvme: Move NVME_CTRLR_*LOG() to nvme_internal.h 



Move NVME_CTRLR_*LOG() from nvme_ctrlr.c to nvme_internal.h to use
these in other files.

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


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 57d621db

lib/nvme/nvme_ctrlr.c

+0 −23
Original line number Diff line number Diff line
@@ -39,29 +39,6 @@ nvme_ns_cmp(struct spdk_nvme_ns *ns1, struct spdk_nvme_ns *ns2) 


RB_GENERATE_STATIC(nvme_ns_tree, spdk_nvme_ns, node, nvme_ns_cmp);



#define CTRLR_STRING(ctrlr) \

	((ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_TCP || ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_RDMA) ? \

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



#define NVME_CTRLR_ERRLOG(ctrlr, format, ...) \

	SPDK_ERRLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_WARNLOG(ctrlr, format, ...) \

	SPDK_WARNLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_NOTICELOG(ctrlr, format, ...) \

	SPDK_NOTICELOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_INFOLOG(ctrlr, format, ...) \

	SPDK_INFOLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#ifdef DEBUG

#define NVME_CTRLR_DEBUGLOG(ctrlr, format, ...) \

	SPDK_DEBUGLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

#else

#define NVME_CTRLR_DEBUGLOG(ctrlr, ...) do { } while (0)

#endif



#define nvme_ctrlr_get_reg_async(ctrlr, reg, sz, cb_fn, cb_arg) \

	nvme_transport_ctrlr_get_reg_ ## sz ## _async(ctrlr, \

		offsetof(struct spdk_nvme_registers, reg), cb_fn, cb_arg)

lib/nvme/nvme_internal.h

+23 −0
Original line number Diff line number Diff line
@@ -587,6 +587,29 @@ struct spdk_nvme_ns { 
	RB_ENTRY(spdk_nvme_ns)		node;

};



#define CTRLR_STRING(ctrlr) \

	((ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_TCP || ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_RDMA) ? \

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



#define NVME_CTRLR_ERRLOG(ctrlr, format, ...) \

	SPDK_ERRLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_WARNLOG(ctrlr, format, ...) \

	SPDK_WARNLOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_NOTICELOG(ctrlr, format, ...) \

	SPDK_NOTICELOG("[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#define NVME_CTRLR_INFOLOG(ctrlr, format, ...) \

	SPDK_INFOLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);



#ifdef DEBUG

#define NVME_CTRLR_DEBUGLOG(ctrlr, format, ...) \

	SPDK_DEBUGLOG(nvme, "[%s] " format, CTRLR_STRING(ctrlr), ##__VA_ARGS__);

#else

#define NVME_CTRLR_DEBUGLOG(ctrlr, ...) do { } while (0)

#endif



/**

 * State of struct spdk_nvme_ctrlr (in particular, during initialization).

 */