From: Klaus Jensen <k.jensen@samsung.com>
Date: Thu, 26 Jan 2023 08:50:54 +0000 (+0100)
Subject: nvme-print: print 64 bit values with json add_value_uint64
X-Git-Tag: v2.3~8^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=595a7b96a478b97e4d83981b1608d7c0d87ca6aa;p=users%2Fsagi%2Fnvme-cli.git

nvme-print: print 64 bit values with json add_value_uint64

Fix json formatting of 64 bit values.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---

diff --git a/nvme-print.c b/nvme-print.c
index 11b370e8..17e012f0 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -2317,7 +2317,7 @@ static void json_nvme_fdp_configs(struct nvme_fdp_config_log *log, size_t len)
 		json_object_add_value_uint(obj_config, "nrg", le32_to_cpu(config->nrg));
 		json_object_add_value_uint(obj_config, "nruh", le16_to_cpu(config->nruh));
 		json_object_add_value_uint(obj_config, "nnss", le32_to_cpu(config->nnss));
-		json_object_add_value_uint(obj_config, "runs", le64_to_cpu(config->runs));
+		json_object_add_value_uint64(obj_config, "runs", le64_to_cpu(config->runs));
 		json_object_add_value_uint(obj_config, "erutl", le32_to_cpu(config->erutl));
 
 		for (int j = 0; j < le16_to_cpu(config->nruh); j++) {
@@ -2498,7 +2498,7 @@ static void json_nvme_fdp_events(struct nvme_fdp_events_log *log)
 		json_object_add_value_uint(obj_event, "type", event->type);
 		json_object_add_value_uint(obj_event, "fdpef", event->flags);
 		json_object_add_value_uint(obj_event, "pid", le16_to_cpu(event->pid));
-		json_object_add_value_uint(obj_event, "timestamp", le64_to_cpu(event->timestamp));
+		json_object_add_value_uint64(obj_event, "timestamp", le64_to_cpu(event->timestamp));
 		json_object_add_value_uint(obj_event, "nsid", le32_to_cpu(event->nsid));
 
 		if (event->type == NVME_FDP_EVENT_REALLOC) {
@@ -2508,7 +2508,7 @@ static void json_nvme_fdp_events(struct nvme_fdp_events_log *log)
 			json_object_add_value_uint(obj_event, "nlbam", le16_to_cpu(mr->nlbam));
 
 			if (mr->flags & NVME_FDP_EVENT_REALLOC_F_LBAV)
-				json_object_add_value_uint(obj_event, "lba", le64_to_cpu(mr->lba));
+				json_object_add_value_uint64(obj_event, "lba", le64_to_cpu(mr->lba));
 		}
 
 		json_array_add_value_object(obj_events, obj_event);
@@ -2599,7 +2599,7 @@ static void json_nvme_fdp_ruh_status(struct nvme_fdp_ruh_status *status, size_t
 		json_object_add_value_uint(obj_ruhs, "pid", le16_to_cpu(ruhs->pid));
 		json_object_add_value_uint(obj_ruhs, "ruhid", le16_to_cpu(ruhs->ruhid));
 		json_object_add_value_uint(obj_ruhs, "earutr", le32_to_cpu(ruhs->earutr));
-		json_object_add_value_uint(obj_ruhs, "ruamw", le64_to_cpu(ruhs->ruamw));
+		json_object_add_value_uint64(obj_ruhs, "ruamw", le64_to_cpu(ruhs->ruamw));
 
 		json_array_add_value_object(obj_ruhss, obj_ruhs);
 	}