From 173b4144dafad92f212d01e2dfdac058acdf08d9 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 18 Mar 2016 10:33:00 -0700 Subject: [PATCH] nvme_manage: shorten simplistic controller listing Fit all of the info about a controller onto a single line. This is more readable with larger numbers of controllers. Change-Id: I145844d5df5c0b1e3f544fd6c8d846ee94b4e662 Signed-off-by: Daniel Verkamp --- examples/nvme/nvme_manage/nvme_manage.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c index e8982668e..d9bc26583 100644 --- a/examples/nvme/nvme_manage/nvme_manage.c +++ b/examples/nvme/nvme_manage/nvme_manage.c @@ -183,6 +183,18 @@ display_controller(struct dev *dev, int model) uint32_t i; cdata = spdk_nvme_ctrlr_get_data(dev->ctrlr); + + if (model == CONTROLLER_DISPLAY_SIMPLISTIC) { + printf("%04x:%02x:%02x.%02x ", + spdk_pci_device_get_domain(dev->pci_dev), spdk_pci_device_get_bus(dev->pci_dev), + spdk_pci_device_get_dev(dev->pci_dev), spdk_pci_device_get_func(dev->pci_dev)); + printf("%-40.40s %-20.20s ", + cdata->mn, cdata->sn); + printf("%5d ", cdata->cntlid); + printf("\n"); + return; + } + printf("=====================================================\n"); printf("NVMe Controller: %04x:%02x:%02x.%02x\n", spdk_pci_device_get_domain(dev->pci_dev), spdk_pci_device_get_bus(dev->pci_dev), @@ -193,8 +205,7 @@ display_controller(struct dev *dev, int model) snprintf(str, sizeof(cdata->sn) + 1, "%s", cdata->sn); printf("Serial Number: %s\n", str); printf("\n"); - if (model == CONTROLLER_DISPLAY_SIMPLISTIC) - return; + printf("Admin Command Set Attributes\n"); printf("============================\n"); printf("Namespace Manage And Attach: %s\n",