ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: add transport id to some log messages

Browse Source 
Change-Id: I02ca8aed1bba1922a69a9b22bca22bce06e9c55f
Signed-off-by: Pan Liu <liupan1111@gmail.com>
Reviewed-on: https://review.gerrithub.io/399536
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Pan Liu 2018-02-13 09:51:43 +08:00 committed by Jim Harris
parent ba1859ed55
commit e51a07dfa1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nvme/nvme.c
View File

@ -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)) { if (!probe_cb || probe_cb(cb_ctx, trid, &opts)) {
ctrlr = nvme_transport_ctrlr_construct(trid, &opts, devhandle); ctrlr = nvme_transport_ctrlr_construct(trid, &opts, devhandle);
if (ctrlr == NULL) { 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; return -1;
} }
@ -387,6 +391,7 @@ nvme_init_controllers(void *cb_ctx, spdk_nvme_attach_cb attach_cb)
if (start_rc) { if (start_rc) {
/* Controller failed to initialize. */ /* Controller failed to initialize. */
TAILQ_REMOVE(&g_nvme_init_ctrlrs, ctrlr, tailq); TAILQ_REMOVE(&g_nvme_init_ctrlrs, ctrlr, tailq);
SPDK_ERRLOG("Failed to initialize SSD: %s\n", ctrlr->trid.traddr);
nvme_ctrlr_destruct(ctrlr); nvme_ctrlr_destruct(ctrlr);
rc = -1; rc = -1;
break; break;

1
lib/nvme/nvme_ctrlr.c
View File

@ -1672,6 +1672,7 @@ nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr)
{ {
struct spdk_nvme_qpair *qpair, *tmp; 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) { TAILQ_FOREACH_SAFE(qpair, &ctrlr->active_io_qpairs, tailq, tmp) {
spdk_nvme_ctrlr_free_io_qpair(qpair); spdk_nvme_ctrlr_free_io_qpair(qpair);
} }