From 81717da1693fb478cd9f68d40a48577c6a4c3cde Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Thu, 9 Jul 2020 11:54:27 +0200 Subject: [PATCH] nvmf: use nvme print completion Signed-off-by: Jacek Kalwas Change-Id: If814edb3c99a7ed9f1800a634f293d3645884457 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3241 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto --- lib/nvmf/ctrlr.c | 6 +++--- test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c | 1 + test/unit/lib/nvmf/tcp.c/tcp_ut.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index e6463ebab..e02a204db 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -2928,9 +2928,9 @@ _nvmf_request_complete(void *ctx) sgroup = nvmf_subsystem_pg_from_connect_cmd(req); } - SPDK_DEBUGLOG(SPDK_LOG_NVMF, - "cpl: cdw0=0x%08x sct=0x%01x sc=0x%02x cid=0x%04x\n", - rsp->cdw0, rsp->status.sct, rsp->status.sc, rsp->cid); + if (SPDK_DEBUGLOG_FLAG_ENABLED("nvmf")) { + spdk_nvme_print_completion(qpair->qid, rsp); + } TAILQ_REMOVE(&qpair->outstanding, req, link); if (nvmf_transport_req_complete(req)) { diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c index 1b54df7b0..1da8f9d54 100644 --- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c +++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c @@ -183,6 +183,7 @@ DEFINE_STUB_V(nvmf_transport_qpair_abort_request, (struct spdk_nvmf_qpair *qpair, struct spdk_nvmf_request *req)); DEFINE_STUB_V(spdk_nvme_print_command, (uint16_t qid, struct spdk_nvme_cmd *cmd)); +DEFINE_STUB_V(spdk_nvme_print_completion, (uint16_t qid, struct spdk_nvme_cpl *cpl)); int spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_cb cb_fn, void *ctx) diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c index cd230ebea..4c75b65aa 100644 --- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c +++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c @@ -210,6 +210,7 @@ DEFINE_STUB_V(nvmf_transport_qpair_abort_request, (struct spdk_nvmf_qpair *qpair, struct spdk_nvmf_request *req)); DEFINE_STUB_V(spdk_nvme_print_command, (uint16_t qid, struct spdk_nvme_cmd *cmd)); +DEFINE_STUB_V(spdk_nvme_print_completion, (uint16_t qid, struct spdk_nvme_cpl *cpl)); struct spdk_trace_histories *g_trace_histories;