nvme-print: print the nvme generic name in json output as well

For both simple and detailed outputs present the nvme generic
chardev name/path similar to how the ns name/path is presented.

Fixes: f0895ceb145e ("nvme-print: print generic device in list command")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20230215090020.620994-1-sagi@grimberg.me
[dwagner: added additional "Generic" output to json_details_list in the
          "Namespace" section]
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index df5616e881191fbd4925eb62c8c1d121ad715f56..176c55572de7ec2617d3efdd161a29fe4350b509 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2507,6 +2507,7 @@ static void json_detail_list(nvme_root_t r)
                                        uint64_t nuse = nvme_ns_get_lba_util(n) * lba;
 
                                        json_object_add_value_string(jns, "NameSpace", nvme_ns_get_name(n));
+                                       json_object_add_value_string(jns, "Generic", nvme_ns_get_generic_name(n));
                                        json_object_add_value_int(jns, "NSID", nvme_ns_get_nsid(n));
                                        json_object_add_value_uint64(jns, "UsedBytes", nuse);
                                        json_object_add_value_uint64(jns, "MaximumLBA", nvme_ns_get_lba_count(n));
@@ -2539,6 +2540,7 @@ static void json_detail_list(nvme_root_t r)
                                uint64_t nuse = nvme_ns_get_lba_util(n) * lba;
 
                                json_object_add_value_string(jns, "NameSpace", nvme_ns_get_name(n));
+                               json_object_add_value_string(jns, "Generic", nvme_ns_get_generic_name(n));
                                json_object_add_value_int(jns, "NSID", nvme_ns_get_nsid(n));
                                json_object_add_value_uint64(jns, "UsedBytes", nuse);
                                json_object_add_value_uint64(jns, "MaximumLBA", nvme_ns_get_lba_count(n));
@@ -2565,15 +2567,18 @@ static struct json_object *json_list_item(nvme_ns_t n)
 {
        struct json_object *jdevice = json_create_object();
        char devname[128] = { 0 };
+       char genname[128] = { 0 };
 
        int lba = nvme_ns_get_lba_size(n);
        uint64_t nsze = nvme_ns_get_lba_count(n) * lba;
        uint64_t nuse = nvme_ns_get_lba_util(n) * lba;
 
        nvme_dev_full_path(n, devname, sizeof(devname));
+       nvme_generic_full_path(n, genname, sizeof(genname));
 
        json_object_add_value_int(jdevice, "NameSpace", nvme_ns_get_nsid(n));
        json_object_add_value_string(jdevice, "DevicePath", devname);
+       json_object_add_value_string(jdevice, "GenericPath", genname);
        json_object_add_value_string(jdevice, "Firmware", nvme_ns_get_firmware(n));
        json_object_add_value_string(jdevice, "ModelNumber", nvme_ns_get_model(n));
        json_object_add_value_string(jdevice, "SerialNumber", nvme_ns_get_serial(n));

diff --git a/nvme-print.c b/nvme-print.c
index fee9aabfc1761ddb27e877cbbb093c6b5b451392..ec98fe304c4b0eb005ff29d2016ff2e0e40bd344 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -5108,7 +5108,7 @@ void nvme_dev_full_path(nvme_ns_t n, char *path, size_t len)
        snprintf(path, len, "%s", nvme_ns_get_name(n));
 }
 
-static void nvme_generic_full_path(nvme_ns_t n, char *path, size_t len)
+void nvme_generic_full_path(nvme_ns_t n, char *path, size_t len)
 {
        int head_instance;
        int instance;

diff --git a/nvme-print.h b/nvme-print.h
index ab11774daa280934f9382683f7a1a8ad71c92117..7a4ceeea51316d77c46e691ef745fe4c1886900c 100644 (file)
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -149,6 +149,7 @@ const char *nvme_feature_to_string(enum nvme_features_id feature);
 const char *nvme_register_to_string(int reg);
 
 void nvme_dev_full_path(nvme_ns_t n, char *path, size_t len);
+void nvme_generic_full_path(nvme_ns_t n, char *path, size_t len);
 char *zone_type_to_string(__u8 cond);
 char *zone_state_to_string(__u8 state);
 const char *nvme_pel_event_to_string(int type);