Commit e51a07df authored by Pan Liu's avatar Pan Liu Committed by Jim Harris
Browse files

nvme: add transport id to some log messages 



Change-Id: I02ca8aed1bba1922a69a9b22bca22bce06e9c55f
Signed-off-by: default avatarPan Liu <liupan1111@gmail.com>
Reviewed-on: https://review.gerrithub.io/399536


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ba1859ed

lib/nvme/nvme.c

+6 −1
Original line number Diff line number Diff line
@@ -349,7 +349,11 @@ nvme_ctrlr_probe(const struct spdk_nvme_transport_id *trid, void *devhandle, 
	if (!probe_cb || probe_cb(cb_ctx, trid, &opts)) {

		ctrlr = nvme_transport_ctrlr_construct(trid, &opts, devhandle);

		if (ctrlr == NULL) {

			if (trid != NULL) {

				SPDK_ERRLOG("Failed to construct NVMe controller for SSD: %s\n", trid->traddr);

			} else {

				SPDK_ERRLOG("Failed to construct NVMe controller\n");

			}

			return -1;

		}
@@ -387,6 +391,7 @@ nvme_init_controllers(void *cb_ctx, spdk_nvme_attach_cb attach_cb) 
			if (start_rc) {

				/* Controller failed to initialize. */

				TAILQ_REMOVE(&g_nvme_init_ctrlrs, ctrlr, tailq);

				SPDK_ERRLOG("Failed to initialize SSD: %s\n", ctrlr->trid.traddr);

				nvme_ctrlr_destruct(ctrlr);

				rc = -1;

				break;

lib/nvme/nvme_ctrlr.c

+1 −0
Original line number Diff line number Diff line
@@ -1672,6 +1672,7 @@ nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) 
{

	struct spdk_nvme_qpair *qpair, *tmp;



	SPDK_DEBUGLOG(SPDK_LOG_NVME, "Prepare to destruct SSD: %s\n", ctrlr->trid.traddr);

	TAILQ_FOREACH_SAFE(qpair, &ctrlr->active_io_qpairs, tailq, tmp) {

		spdk_nvme_ctrlr_free_io_qpair(qpair);

	}