summaryrefslogtreecommitdiffstats
path: root/nvme-print-json.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-02-19 10:45:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-02-19 10:45:45 +0000
commit476d0b41d27c48140ec2284a5a5f505e8423fe65 (patch)
tree369a4a0f5ba4b1e66dc22bcb107b1825fa15c247 /nvme-print-json.c
parentReleasing debian version 2.7.1-1. (diff)
downloadnvme-cli-476d0b41d27c48140ec2284a5a5f505e8423fe65.tar.xz
nvme-cli-476d0b41d27c48140ec2284a5a5f505e8423fe65.zip
Merging upstream version 2.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'nvme-print-json.c')
-rw-r--r--nvme-print-json.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nvme-print-json.c b/nvme-print-json.c
index 5a09b6b..27f5c7c 100644
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -3836,7 +3836,7 @@ static void json_support_log(struct nvme_supported_log_pages *support_log,
}
}
- obj_add_obj(r, "supported_logs", valid);
+ obj_add_array(r, "supported_logs", valid);
json_print(r);
}
@@ -4148,11 +4148,11 @@ static void json_directive_show_fields_identify(__u8 doper, __u8 *field, struct
obj_add_array(r, "Directive Persistent Across Controller Level Resets",
persistent);
obj_add_str(persistent, "Identify Directive",
- *(field + 32) & 0x1 ? "Enabled" : "Disabled");
+ *(field + 64) & 0x1 ? "Enabled" : "Disabled");
obj_add_str(persistent, "Stream Directive",
- *(field + 32) & 0x2 ? "Enabled" : "Disabled");
+ *(field + 64) & 0x2 ? "Enabled" : "Disabled");
obj_add_str(persistent, "Data Placement Directive",
- *(field + 32) & 0x4 ? "Enabled" : "Disabled");
+ *(field + 64) & 0x4 ? "Enabled" : "Disabled");
break;
default:
obj_add_str(r, "Error", "invalid directive operations for Identify Directives");