nvme-print: display model in list-subsys output

Include the subsys model 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 7cdd78956654bb59597a8cb3159cee4bd2b67951..077433f3d7b36ddb5c3fb2725511b08a57927b64 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2541,6 +2541,8 @@ static void json_print_nvme_subsystem_list(nvme_root_t r, bool show_ana)
                        obj_add_str(subsystem_attrs, "NQN", nvme_subsystem_get_nqn(s));
 
                        if (json_print_ops.flags & VERBOSE) {
+                               obj_add_str(subsystem_attrs, "Model",
+                                               nvme_subsystem_get_model(s));
                                obj_add_str(subsystem_attrs, "IOPolicy",
                                                nvme_subsystem_get_iopolicy(s));
                                obj_add_str(subsystem_attrs, "Type",
@@ -4497,6 +4499,8 @@ static void json_simple_topology(nvme_root_t r)
                        obj_add_str(subsystem_attrs, "NQN", nvme_subsystem_get_nqn(s));
 
                        if (json_print_ops.flags & VERBOSE) {
+                               obj_add_str(subsystem_attrs, "Model",
+                                               nvme_subsystem_get_model(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 de6497782ba3aa2d1a45c8026b5c2f7ccc8e789f..90988b7247c88d91e644fd25cac39555182ad40f 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -1112,6 +1112,8 @@ static void stdout_subsys_config(nvme_subsystem_t s)
               nvme_host_get_hostnqn(nvme_subsystem_get_host(s)));
 
        if (stdout_print_ops.flags & VERBOSE) {
+               printf("%*s   model=%s\n", len, " ",
+                       nvme_subsystem_get_model(s));
                printf("%*s   iopolicy=%s\n", len, " ",
                        nvme_subsystem_get_iopolicy(s));
                printf("%*s   type=%s\n", len, " ",