From 8cc7af9c01dbe4eb303e9bbc142ddc6fa4070aba Mon Sep 17 00:00:00 2001 From: Martin George Date: Thu, 3 Apr 2025 22:08:23 +0530 Subject: [PATCH 1/2] 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 --- nvme-print-json.c | 4 ++++ nvme-print-stdout.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/nvme-print-json.c b/nvme-print-json.c index 7cdd789566..077433f3d7 100644 --- 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 de6497782b..90988b7247 100644 --- 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, " ", From 4498537883a67e7c1c5b411e4f893fabcdef3146 Mon Sep 17 00:00:00 2001 From: Martin George Date: Thu, 3 Apr 2025 22:15:28 +0530 Subject: [PATCH 2/2] 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 --- nvme-print-json.c | 4 ++++ nvme-print-stdout.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/nvme-print-json.c b/nvme-print-json.c index 077433f3d7..dbb8bb7851 100644 --- 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 90988b7247..75430be2be 100644 --- 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, " ",