nvme-print: display fw-rev in list-subsys output

Include the subsys firmware revision as well in the list-subsys
verbose output.

Signed-off-by: Martin George <marting@netapp.com>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index 077433f3d7b36ddb5c3fb2725511b08a57927b64..dbb8bb785195a3660d5f0b1efe6e93b68ba8b824 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2543,6 +2543,8 @@ static void json_print_nvme_subsystem_list(nvme_root_t r, bool show_ana)
                        if (json_print_ops.flags & VERBOSE) {
                                obj_add_str(subsystem_attrs, "Model",
                                                nvme_subsystem_get_model(s));
+                               obj_add_str(subsystem_attrs, "Firmware",
+                                               nvme_subsystem_get_fw_rev(s));
                                obj_add_str(subsystem_attrs, "IOPolicy",
                                                nvme_subsystem_get_iopolicy(s));
                                obj_add_str(subsystem_attrs, "Type",
@@ -4501,6 +4503,8 @@ static void json_simple_topology(nvme_root_t r)
                        if (json_print_ops.flags & VERBOSE) {
                                obj_add_str(subsystem_attrs, "Model",
                                                nvme_subsystem_get_model(s));
+                               obj_add_str(subsystem_attrs, "Firmware",
+                                               nvme_subsystem_get_fw_rev(s));
                                obj_add_str(subsystem_attrs, "IOPolicy",
                                                nvme_subsystem_get_iopolicy(s));
                                obj_add_str(subsystem_attrs, "Type",

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 90988b7247c88d91e644fd25cac39555182ad40f..75430be2be16907f85f6a9393b4a52b875f8fe78 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -1114,6 +1114,8 @@ static void stdout_subsys_config(nvme_subsystem_t s)
        if (stdout_print_ops.flags & VERBOSE) {
                printf("%*s   model=%s\n", len, " ",
                        nvme_subsystem_get_model(s));
+               printf("%*s   firmware=%s\n", len, " ",
+                       nvme_subsystem_get_fw_rev(s));
                printf("%*s   iopolicy=%s\n", len, " ",
                        nvme_subsystem_get_iopolicy(s));
                printf("%*s   type=%s\n", len, " ",