From 476d0b41d27c48140ec2284a5a5f505e8423fe65 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 19 Feb 2024 11:45:37 +0100 Subject: Merging upstream version 2.8. Signed-off-by: Daniel Baumann --- nvme-print-json.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nvme-print-json.c') 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"); -- cgit v1.2.3