From 0d8471f261f4a9feac4899cd1de7b75cb5c201b5 Mon Sep 17 00:00:00 2001 From: Martin George Date: Thu, 8 May 2025 01:06:23 +0530 Subject: [PATCH 1/2] build: bump libnvme wrap Include displaying subsystem serial number routine. Signed-off-by: Martin George --- subprojects/libnvme.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/libnvme.wrap b/subprojects/libnvme.wrap index 462ed85785..2de53f89f1 100644 --- a/subprojects/libnvme.wrap +++ b/subprojects/libnvme.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/linux-nvme/libnvme.git -revision = ef4df90bf674abb9ee5cd7560c5e92c8705e2c3b +revision = 81bd404245823763121278fdd5f01c8177e81218 [provide] libnvme = libnvme_dep From 53d321dc31466db8727edd5ae922511d12e34c1e Mon Sep 17 00:00:00 2001 From: Martin George Date: Thu, 8 May 2025 01:18:21 +0530 Subject: [PATCH 2/2] nvme-print: display serial num in list-subsys output Include the subsys serial number in the list-subsys 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 d6923d1824..e073a07ee8 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, "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", diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c index aadd0f29bb..9e48d33019 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 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, " ",