nvme-print-json: include vs for identify namespace

While the spec may allow for arbitrary use of vendor-specific
data, some implementations are simply strings.  JSON will
encode the string, allowing for safe use of control characters.

The only requirement is that the there be a null-byte in the
vendor-specific field terminating the string.  Data beyond the
null-byte will be ignored.

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
[dwagner: use d_json instead obj_add_str]
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index ed9dd4b36cb7730024d1354f36f33a16893f84d0..d296788bc3065e3febf8fd9c90368a56fb4c3afb 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -36,6 +36,27 @@ static const uint8_t zero_uuid[16] = { 0 };
 static struct print_ops json_print_ops;
 static struct json_object *json_r = NULL;
 
+static void d_json(unsigned char *buf, int len, int width, int group, struct json_object *array)
+{
+       int i;
+       char ascii[32 + 1] = { 0 };
+
+       assert(width < sizeof(ascii));
+
+       for (i = 0; i < len; i++) {
+               ascii[i % width] = (buf[i] >= '!' && buf[i] <= '~') ? buf[i] : '.';
+               if (!((i + 1) % width)) {
+                       array_add_str(array, ascii);
+                       memset(ascii, 0, sizeof(ascii));
+               }
+       }
+
+       if (strlen(ascii)) {
+               ascii[i % width + 1] = '\0';
+               array_add_str(array, ascii);
+       }
+}
+
 static void obj_add_uint_x(struct json_object *o, const char *k, __u32 v)
 {
        char str[STR_LEN];
@@ -187,6 +208,7 @@ static void json_nvme_id_ns(struct nvme_id_ns *ns, unsigned int nsid,
        char *nguid = nguid_buf, *eui64 = eui64_buf;
        struct json_object *r = json_create_object();
        struct json_object *lbafs = json_create_array();
+       struct json_object *vs = json_create_array();
        int i;
        nvme_uint128_t nvmcap = le128_to_cpu(ns->nvmcap);
 
@@ -267,6 +289,9 @@ static void json_nvme_id_ns(struct nvme_id_ns *ns, unsigned int nsid,
                array_add_obj(lbafs, lbaf);
        }
 
+       d_json(ns->vs, strnlen((const char *)ns->vs, sizeof(ns->vs)), 16, 1, vs);
+       obj_add_array(r, "vs", vs);
+
        json_print(r);
 }
 
@@ -2664,27 +2689,6 @@ static void json_ctrl_registers(void *bar, bool fabrics)
        json_print(r);
 }
 
-static void d_json(unsigned char *buf, int len, int width, int group, struct json_object *array)
-{
-       int i;
-       char ascii[32 + 1] = { 0 };
-
-       assert(width < sizeof(ascii));
-
-       for (i = 0; i < len; i++) {
-               ascii[i % width] = (buf[i] >= '!' && buf[i] <= '~') ? buf[i] : '.';
-               if (!((i + 1) % width)) {
-                       array_add_str(array, ascii);
-                       memset(ascii, 0, sizeof(ascii));
-               }
-       }
-
-       if (strlen(ascii)) {
-               ascii[i % width + 1] = '\0';
-               array_add_str(array, ascii);
-       }
-}
-
 static void json_nvme_cmd_set_independent_id_ns(struct nvme_id_independent_id_ns *ns,
                                                unsigned int nsid)
 {