From 28b3323f807a953688158f900c9d3546a47b4125 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Mon, 1 Jun 2020 10:15:07 -0700 Subject: [PATCH] list-subsys: compact list omit namespaces and paths without verbose, like legacy nvme-cli would display. Signed-off-by: Keith Busch --- nvme.c | 4 ++-- util/user-types.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nvme.c b/nvme.c index b33bf65..aa8c93d 100644 --- 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 046a9ec..39dd685 100644 --- 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 ? '|' : ' ', -- 2.50.1