nvme-print: Add nvme_zns_finish_zone_list() API function

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index d5185eb52007a0473d2321497606e9e20fbe4f0e..c192a99d569e6c6cf3a798eed1f85b2ea7561010 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -3318,8 +3318,7 @@ static void stdout_zns_report_zones(void *report, __u32 descs,
                                (uint64_t)le64_to_cpu(desc->zcap), nvme_zone_state_to_string(desc->zs >> 4),
                                nvme_zone_type_to_string(desc->zt));
                        stdout_zns_report_zone_attributes(desc->za, desc->zai);
-               }
-               else {
+               } else {
                        printf("SLBA: %#-10"PRIx64" WP: %#-10"PRIx64" Cap: %#-10"PRIx64" State: %#-4x Type: %#-4x Attrs: %#-4x AttrsInfo: %#-4x\n",
                                (uint64_t)le64_to_cpu(desc->zslba), (uint64_t)le64_to_cpu(desc->wp),
                                (uint64_t)le64_to_cpu(desc->zcap), desc->zs, desc->zt,
@@ -3340,9 +3339,8 @@ static void stdout_list_ctrl(struct nvme_ctrl_list *ctrl_list)
        int i;
 
        printf("num of ctrls present: %u\n", num);
-       for (i = 0; i < min(num, 2047); i++) {
+       for (i = 0; i < min(num, 2047); i++)
                printf("[%4u]:%#x\n", i, le16_to_cpu(ctrl_list->identifier[i]));
-       }
 }
 
 static void stdout_id_nvmset(struct nvme_id_nvmset_list *nvmset,

diff --git a/nvme-print.c b/nvme-print.c
index 7b5751692d39eec0edb698e2200dadd172f3edf2..5bb45bf1b7603aeabd93763d7d2929c50fdcd21f 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -507,6 +507,12 @@ void nvme_show_zns_changed(struct nvme_zns_changed_zone_log *log,
        nvme_print(zns_changed_zone_log, flags, log);
 }
 
+void nvme_zns_finish_zone_list(__u64 nr_zones, struct json_object *zone_list,
+                              enum nvme_print_flags flags)
+{
+       nvme_print(zns_finish_zone_list, flags, nr_zones, zone_list);
+}
+
 const char *nvme_zone_type_to_string(__u8 cond)
 {
        switch (cond) {

diff --git a/nvme-print.h b/nvme-print.h
index 1c7e5dcc93e11fda82c599961b98456b03d450b5..deda415ca130d428c87883b5f464dad5bb4126d9 100644 (file)
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -223,6 +223,8 @@ void nvme_show_zns_id_ns(struct nvme_zns_id_ns *ns,
                         struct nvme_id_ns *id_ns, enum nvme_print_flags flags);
 void nvme_show_zns_changed(struct nvme_zns_changed_zone_log *log,
                           enum nvme_print_flags flags);
+void nvme_zns_finish_zone_list(__u64 nr_zones, struct json_object *zone_list,
+                              enum nvme_print_flags flags);
 void nvme_show_zns_report_zones(void *report, __u32 descs,
                                __u8 ext_size, __u32 report_size,
                                struct json_object *zone_list,

diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
index 7b1b191b6e3746cf4ea219b20d173e386b98ce29..0bc42bc28f6edffc3a1466e660cf953704fd1729 100644 (file)
--- a/plugins/zns/zns.c
+++ b/plugins/zns/zns.c
@@ -846,7 +846,7 @@ static int report_zones(int argc, char **argv, struct command *cmd, struct plugi
        struct nvme_id_ns id_ns;
        uint8_t lbaf;
        __le64  zsze;
-       struct json_object *zone_list = 0;
+       struct json_object *zone_list = NULL;
 
        struct config {
                char *output_format;
@@ -989,13 +989,7 @@ static int report_zones(int argc, char **argv, struct command *cmd, struct plugi
                offset = le64_to_cpu(report->entries[nr_zones_chunks-1].zslba) + zsze;
        }
 
-       if (flags & JSON) {
-               struct print_ops *ops;
-
-               ops = nvme_get_json_print_ops(flags);
-               if (ops)
-                       ops->zns_finish_zone_list(total_nr_zones, zone_list);
-       }
+       nvme_zns_finish_zone_list(total_nr_zones, zone_list, flags);
 
        nvme_free_huge(report, huge);