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

nvme_manage: shorten simplistic controller listing

Browse Source 
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 <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-03-18 10:33:00 -07:00
parent 5bb16e86a1
commit 173b4144da
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -183,6 +183,18 @@ display_controller(struct dev *dev, int model)
uint32_t i; uint32_t i;
cdata = spdk_nvme_ctrlr_get_data(dev->ctrlr); 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("=====================================================\n");
printf("NVMe Controller: %04x:%02x:%02x.%02x\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), 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); snprintf(str, sizeof(cdata->sn) + 1, "%s", cdata->sn);
printf("Serial Number: %s\n", str); printf("Serial Number: %s\n", str);
printf("\n"); printf("\n");
if (model == CONTROLLER_DISPLAY_SIMPLISTIC)
return;
printf("Admin Command Set Attributes\n"); printf("Admin Command Set Attributes\n");
printf("============================\n"); printf("============================\n");
printf("Namespace Manage And Attach: %s\n", printf("Namespace Manage And Attach: %s\n",