From: Keith Busch <keith.busch@intel.com>
Date: Mon, 8 May 2017 20:48:12 +0000 (-0400)
Subject: nvme-list: print empty lists when no devices are present
X-Git-Tag: v1.3~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=213119acd04d99456a90519b17726374959b55ca;p=users%2Fsagi%2Fnvme-cli.git

nvme-list: print empty lists when no devices are present

https://github.com/linux-nvme/nvme-cli/issues/173

Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/nvme-print.c b/nvme-print.c
index b52c2693..d28fbe14 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -1149,7 +1149,8 @@ void json_print_list_items(struct list_item *list_items, unsigned len)
 		json_array_add_value_object(devices, device_attrs);
 		free((void*)product);
 	}
-	json_object_add_value_array(root, "Devices", devices);
+	if (i)
+		json_object_add_value_array(root, "Devices", devices);
 	json_print_object(root, NULL);
 }
 
diff --git a/nvme.c b/nvme.c
index 4cc5a96d..c2196346 100644
--- a/nvme.c
+++ b/nvme.c
@@ -834,7 +834,7 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
 		return -EINVAL;
 
 	n = scandir(dev, &devices, scan_dev_filter, alphasort);
-	if (n <= 0)
+	if (n < 0)
 		return n;
 
 	list_items = calloc(n, sizeof(*list_items));