From bd7689bd18da28f35d09dfbebd9a19f58c032ae4 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 18 Jun 2020 00:45:25 -0400 Subject: [PATCH] test/nvme_arbitration: don't print inactive namespace information There are many log prints such as: Controller INTEL SSDPF2KX012TZ (PHAC0016001N1P2EGN ): Skipping inactive NS 0 Controller INTEL SSDPF2KX012TZ (PHAC0016001N1P2EGN ): Skipping inactive NS 0 for inactive namespaces, so here we just register active namespaces for tests. Change-Id: Idbb89c4e5610b4c725dbc211acaefd1897cceeb5 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2933 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- examples/nvme/arbitration/arbitration.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/examples/nvme/arbitration/arbitration.c b/examples/nvme/arbitration/arbitration.c index 32a99401f..c63dc8c83 100644 --- a/examples/nvme/arbitration/arbitration.c +++ b/examples/nvme/arbitration/arbitration.c @@ -158,13 +158,6 @@ register_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns *ns) cdata = spdk_nvme_ctrlr_get_data(ctrlr); - if (!spdk_nvme_ns_is_active(ns)) { - printf("Controller %-20.20s (%-20.20s): Skipping inactive NS %u\n", - cdata->mn, cdata->sn, - spdk_nvme_ns_get_id(ns)); - return; - } - if (spdk_nvme_ns_get_size(ns) < g_arbitration.io_size_bytes || spdk_nvme_ns_get_sector_size(ns) > g_arbitration.io_size_bytes) { printf("WARNING: controller %-20.20s (%-20.20s) ns %u has invalid " @@ -231,7 +224,7 @@ set_latency_tracking_feature(struct spdk_nvme_ctrlr *ctrlr, bool enable) static void register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) { - int nsid, num_ns; + uint32_t nsid; struct spdk_nvme_ns *ns; struct ctrlr_entry *entry = calloc(1, sizeof(struct ctrlr_entry)); union spdk_nvme_cap_register cap = spdk_nvme_ctrlr_get_regs_cap(ctrlr); @@ -253,8 +246,8 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) set_latency_tracking_feature(ctrlr, true); } - num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr); - for (nsid = 1; nsid <= num_ns; nsid++) { + for (nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr); nsid != 0; + nsid = spdk_nvme_ctrlr_get_next_active_ns(ctrlr, nsid)) { ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid); if (ns == NULL) { continue;