From e51a07dfa183cb2548ae84c61f59406564c4c08b Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Tue, 13 Feb 2018 09:51:43 +0800 Subject: [PATCH] nvme: add transport id to some log messages Change-Id: I02ca8aed1bba1922a69a9b22bca22bce06e9c55f Signed-off-by: Pan Liu Reviewed-on: https://review.gerrithub.io/399536 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/nvme/nvme.c | 7 ++++++- lib/nvme/nvme_ctrlr.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/nvme/nvme.c b/lib/nvme/nvme.c index ee4494229..535cbf2cd 100644 --- a/lib/nvme/nvme.c +++ b/lib/nvme/nvme.c @@ -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) { - SPDK_ERRLOG("Failed to construct NVMe controller\n"); + 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; diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 593c43430..e7c58a970 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -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); }