nvme-print: print more details in ns-descs verbose output

Print additional details such as loc, nidt, nidl & type in the
ns-descs verbose output for parity with the corresponding
json output.

Signed-off-by: Martin George <marting@netapp.com>

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 63462ea60cb929580798c63fc1eb6ab7a46a3236..90cf29f6154179ba2add64e93b8e3f5687887ad7 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -2714,7 +2714,7 @@ static void stdout_cmd_set_independent_id_ns(struct nvme_id_independent_id_ns *n
 static void stdout_id_ns_descs(void *data, unsigned int nsid)
 {
        int pos, len = 0;
-       int i;
+       int i, verbose = stdout_print_ops.flags & VERBOSE;
        __u8 uuid[NVME_UUID_LEN];
        char uuid_str[NVME_UUID_LEN_STRING];
        __u8 eui64[8];
@@ -2728,9 +2728,17 @@ static void stdout_id_ns_descs(void *data, unsigned int nsid)
                if (cur->nidl == 0)
                        break;
 
+               if (verbose) {
+                       printf("loc     : %d\n", pos);
+                       printf("nidt    : %d\n", (int)cur->nidt);
+                       printf("nidl    : %d\n", (int)cur->nidl);
+               }
+
                switch (cur->nidt) {
                case NVME_NIDT_EUI64:
                        memcpy(eui64, data + pos + sizeof(*cur), sizeof(eui64));
+                       if (verbose)
+                               printf("type    : eui64\n");
                        printf("eui64   : ");
                        for (i = 0; i < 8; i++)
                                printf("%02x", eui64[i]);
@@ -2739,6 +2747,8 @@ static void stdout_id_ns_descs(void *data, unsigned int nsid)
                        break;
                case NVME_NIDT_NGUID:
                        memcpy(nguid, data + pos + sizeof(*cur), sizeof(nguid));
+                       if (verbose)
+                               printf("type    : nguid\n");
                        printf("nguid   : ");
                        for (i = 0; i < 16; i++)
                                printf("%02x", nguid[i]);
@@ -2748,11 +2758,15 @@ static void stdout_id_ns_descs(void *data, unsigned int nsid)
                case NVME_NIDT_UUID:
                        memcpy(uuid, data + pos + sizeof(*cur), 16);
                        nvme_uuid_to_string(uuid, uuid_str);
+                       if (verbose)
+                               printf("type    : uuid\n");
                        printf("uuid    : %s\n", uuid_str);
                        len = sizeof(uuid);
                        break;
                case NVME_NIDT_CSI:
                        memcpy(&csi, data + pos + sizeof(*cur), 1);
+                       if (verbose)
+                               printf("type    : csi\n");
                        printf("csi     : %#x\n", csi);
                        len += sizeof(csi);
                        break;

diff --git a/nvme.c b/nvme.c
index e9aac8ff30dc01aa5dd656f3d68e50c4a46fd988..cdc4221fecb4f3377be25b1b171672dc5606eb1e 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -3615,6 +3615,9 @@ static int ns_descs(int argc, char **argv, struct command *cmd, struct plugin *p
        if (cfg.raw_binary)
                flags = BINARY;
 
+       if (argconfig_parse_seen(opts, "verbose"))
+               flags |= VERBOSE;
+
        if (!cfg.namespace_id) {
                err = nvme_get_nsid(dev_fd(dev), &cfg.namespace_id);
                if (err < 0) {