nvme-print: display serial num in list-subsys output

Include the subsys serial number in the list-subsys output.

Signed-off-by: Martin George <[email protected]>

Author: martin-gpy

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, "Serial",
+						nvme_subsystem_get_serial(s));
 				obj_add_str(subsystem_attrs, "Firmware",
 						nvme_subsystem_get_fw_rev(s));
 				obj_add_str(subsystem_attrs, "IOPolicy",
@@ -4575,6 +4577,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, "Serial",
+						nvme_subsystem_get_serial(s));
 				obj_add_str(subsystem_attrs, "Firmware",
 						nvme_subsystem_get_fw_rev(s));
 				obj_add_str(subsystem_attrs, "IOPolicy",

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   serial=%s\n", len, " ",
+			nvme_subsystem_get_serial(s));
 		printf("%*s   firmware=%s\n", len, " ",
 			nvme_subsystem_get_fw_rev(s));
 		printf("%*s   iopolicy=%s\n", len, " ",