Skip to contentSkip to conversation

NVMe-CLI Fix fw_log Command json output

PATCH New Jeff Lien 2 participants 3 messages Feb 2, 2018 – Feb 5, 2018 NVMe

lore
Share & tools
lore

Jeff Lien

author
#0 lore raw

PATCH 1/1 NVMe-CLI Fix fw_log Command json output

Currently, the json output for the fw_log command slot number is zero based while the normal output is one based. This patch will change the json output to one based. It will also only print the revisions for the valid slots.

Signed-off-by Jeff Lien <jeff.lien at wdc.com>
---
 nvme-print.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
nvme-print.c +7 -4
index 1ca4b71..eaaf976 100644
@@ -58,6 +58,7 @@ void d_raw(unsigned char *buf, unsigned len)
 	unsigned i;
 	for (i = 0; i < len; i++)
 		putchar(*(buf+i));
+	printf("\n");
 }
 
 static void format(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz)
@@ -1928,10 +1929,12 @@ void json_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname)
 	json_object_add_value_int(fwsi, "Active Firmware Slot (afi)", fw_log->afi);
 
 	for (i = 0; i < 7; i++) {
-		snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i);
-		snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],
-			 fw_to_string(fw_log->frs[i]));
-		json_object_add_value_string(fwsi, fmt, str);
+		if (fw_log->frs[i]) {
+		 	snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i+1);
+		 	snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],
+		 		fw_to_string(fw_log->frs[i]));
+		 	json_object_add_value_string(fwsi, fmt, str);
+		 }
 	}
 	json_object_add_value_object(root, devname, fwsi);
 
Signature · 1 line
2.14.2.746.g8fb8a94
#1 lore raw

PATCH 1/1 NVMe-CLI Fix fw_log Command json output

Quoted 4 lines · Jeff Lien

Currently, the json output for the fw_log command slot number is zero based while the normal output is one based. This patch will change the json output to one based. It will also only print the revisions for the valid slots.

Totally fine with the json update. Not sure about the binary output, though. That mode is meant for piping structures to other programs and not sure how those will handle data beyond what they're expecting.

Quoted 24 lines
nvme-print.c +7 -4
@@ -58,6 +58,7 @@ void d_raw(unsigned char *buf, unsigned len)
 	unsigned i;
 	for (i = 0; i < len; i++)
 		putchar(*(buf+i));
+	printf("\n");
 }
 
 static void format(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz)
@@ -1928,10 +1929,12 @@ void json_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname)
 	json_object_add_value_int(fwsi, "Active Firmware Slot (afi)", fw_log->afi);
 
 	for (i = 0; i < 7; i++) {
-		snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i);
-		snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],
-			 fw_to_string(fw_log->frs[i]));
-		json_object_add_value_string(fwsi, fmt, str);
+		if (fw_log->frs[i]) {
+		 	snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i+1);
+		 	snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],
+		 		fw_to_string(fw_log->frs[i]));
+		 	json_object_add_value_string(fwsi, fmt, str);
+		 }
 	}
 	json_object_add_value_object(root, devname, fwsi);
#2 lore raw

PATCH 1/1 NVMe-CLI Fix fw_log Command json output

Ok, I'll remove the change to the binary output function.

Jeff Lien

-----Original Message-----
From: Linux-nvme [mailto:[email protected]] On Behalf Of Keith Busch
Sent: Friday, February 2, 2018 5:19 PM
To: Jeffrey Lien
Cc: David Darrington; linux-nvme at lists.infradead.org
Subject: Re: [PATCH] NVMe-CLI Fix fw_log Command json output

Quoted 4 lines · Jeff Lien

Currently, the json output for the fw_log command slot number is zero based while the normal output is one based. This patch will change the json output to one based. It will also only print the revisions for the valid slots.

Totally fine with the json update. Not sure about the binary output, though. That mode is meant for piping structures to other programs and not sure how those will handle data beyond what they're expecting.

Quoted 15 lines
nvme-print.c +1 -0
@@ -58,6 +58,7 @@ void d_raw(unsigned char *buf, unsigned len)
 	unsigned i;
 	for (i = 0; i < len; i++)
 		putchar(*(buf+i));
+	printf("\n");
 }
 
 static void format(char *formatter, size_t fmt_sz, char *tofmt, 

size_t tofmtsz) @@ -1928,10 +1929,12 @@ void json_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname)
json_object_add_value_int(fwsi, "Active Firmware Slot (afi)",
fw_log->afi);

nvme-print.c +0 -2
 	for (i = 0; i < 7; i++) {
-		snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i);
-		snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],

nvme-print.c void json_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname) · line 1939

Quoted 10 lines
nvme-print.c +6 -2
-			 fw_to_string(fw_log->frs[i]));
-		json_object_add_value_string(fwsi, fmt, str);
+		if (fw_log->frs[i]) {
+		 	snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d", i+1);
+		 	snprintf(str, sizeof(str), "%"PRIu64" (%s)", (uint64_t)fw_log->frs[i],
+		 		fw_to_string(fw_log->frs[i]));
+		 	json_object_add_value_string(fwsi, fmt, str);
+		 }
 	}
 	json_object_add_value_object(root, devname, fwsi);

_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme