list-subsys: compact list

omit namespaces and paths without verbose, like legacy nvme-cli would
display.

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/nvme.c b/nvme.c
index b33bf65377febba05f33d79bc9985281b757d077..aa8c93dcbdfec5aaa76e2d77aead58d7af297ed2 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -1394,8 +1394,8 @@ static int list_subsys(int argc, char **argv, struct command *cmd,
        if (flags < 0)
                return err;
 
-       if (cfg.verbose)
-               flags |= 0;
+       if (!cfg.verbose)
+               flags |= NVME_JSON_COMPACT;
 
        if (devicename)
                r = nvme_scan_filter(nvme_match_device_filter);

diff --git a/util/user-types.c b/util/user-types.c
index 046a9ec1784f49bcfba31fb90ddfebaa4669d9fb..39dd6850d04af93b669d4ff9901897fdb7f9f85b 100644 (file)
--- a/util/user-types.c
+++ b/util/user-types.c
@@ -4385,11 +4385,13 @@ void nvme_show_subsystem_list(nvme_root_t r, unsigned long flags)
                        nvme_subsystem_get_name(s),
                        nvme_subsystem_get_nqn(s));
 
-               nvme_subsystem_for_each_ns_safe(s, n, _n) {
-                       printf("%c   |-- %s lba size:%d lba max:%lu\n",
-                               _s ? '|' : ' ',
-                               nvme_ns_get_name(n), nvme_ns_get_lba_size(n),
-                               nvme_ns_get_lba_count(n));
+               if (!(flags & NVME_JSON_COMPACT)) {
+                       nvme_subsystem_for_each_ns_safe(s, n, _n)
+                               printf("%c   |-- %s lba size:%d lba max:%lu\n",
+                                       _s ? '|' : ' ',
+                                       nvme_ns_get_name(n),
+                                       nvme_ns_get_lba_size(n),
+                                       nvme_ns_get_lba_count(n));
                }
 
                nvme_subsystem_for_each_ctrl_safe(s, c, _c) {
@@ -4401,6 +4403,9 @@ void nvme_show_subsystem_list(nvme_root_t r, unsigned long flags)
                                nvme_ctrl_get_address(c),
                                nvme_ctrl_get_state(c));
 
+                       if (flags & NVME_JSON_COMPACT)
+                               continue;
+
                        nvme_ctrl_for_each_ns_safe(c, n, _n)
                                printf("%c   %c   %c-- %s lba size:%d lba max:%lu\n",
                                        _s ? '|' : ' ',