From: Pierre Labat <plabat@micron.com>
Date: Fri, 26 Aug 2022 22:02:08 +0000 (-0500)
Subject: nvme-print: Print fguid as a UUID
X-Git-Tag: v2.2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78b7ad235507ddd59c75c7fcc74fc6c927811f87;p=users%2Fsagi%2Fnvme-cli.git

nvme-print: Print fguid as a UUID

Signed-off-by: Pierre Labat <plabat@micron.com>
[dwagner: added json output]
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/nvme-print.c b/nvme-print.c
index 2d6587d7..b5451dc7 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -47,6 +47,16 @@ static long double int128_to_double(__u8 *data)
 	return result;
 }
 
+static const char *nvme_uuid_to_string(uuid_t uuid)
+{
+	/* large enough to hold uuid str (37) + null-termination byte */
+	static char uuid_str[40];
+
+	uuid_unparse_lower(uuid, uuid_str);
+
+	return uuid_str;
+}
+
 static const char *nvme_ana_state_to_string(enum nvme_ana_state state)
 {
 	switch (state) {
@@ -279,6 +289,7 @@ static void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl,
 	json_object_add_value_uint(root, "oaes", le32_to_cpu(ctrl->oaes));
 	json_object_add_value_int(root, "ctratt", le32_to_cpu(ctrl->ctratt));
 	json_object_add_value_int(root, "rrls", le16_to_cpu(ctrl->rrls));
+	json_object_add_value_string(root, "fguid", nvme_uuid_to_string(ctrl->fguid));
 	json_object_add_value_int(root, "crdt1", le16_to_cpu(ctrl->crdt1));
 	json_object_add_value_int(root, "crdt2", le16_to_cpu(ctrl->crdt2));
 	json_object_add_value_int(root, "crdt3", le16_to_cpu(ctrl->crdt3));
@@ -3282,16 +3293,6 @@ void nvme_show_status(__u16 status)
 		nvme_status_to_string(status, false), status);
 }
 
-static const char *nvme_uuid_to_string(uuid_t uuid)
-{
-	/* large enough to hold uuid str (37) + null-termination byte */
-	static char uuid_str[40];
-
-	uuid_unparse_lower(uuid, uuid_str);
-
-	return uuid_str;
-}
-
 static void nvme_show_id_ctrl_cmic(__u8 cmic)
 {
 	__u8 rsvd = (cmic & 0xF0) >> 4;
@@ -4624,7 +4625,7 @@ void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, enum nvme_print_flags flags,
 	printf("cntrltype : %d\n", ctrl->cntrltype);
 	if (human)
 		nvme_show_id_ctrl_cntrltype(ctrl->cntrltype);
-	printf("fguid     : %-.*s\n", (int)sizeof(ctrl->fguid), ctrl->fguid);
+	printf("fguid     : %s\n", nvme_uuid_to_string(ctrl->fguid));
 	printf("crdt1     : %u\n", le16_to_cpu(ctrl->crdt1));
 	printf("crdt2     : %u\n", le16_to_cpu(ctrl->crdt2));
 	printf("crdt3     : %u\n", le16_to_cpu(ctrl->crdt3));