From fd268d35cbddff04fc0b27a8af2c97185c8a97ba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Aug 2022 14:32:15 +0200 Subject: Merging upstream version 2.1.2. Signed-off-by: Daniel Baumann --- nvme-print.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'nvme-print.c') diff --git a/nvme-print.c b/nvme-print.c index 696f192..e92ba82 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -5661,7 +5661,7 @@ void nvme_show_id_uuid_list(const struct nvme_id_uuid_list *uuid_list, /* The 0th entry is reserved */ printf("NVME Identify UUID:\n"); - for (i = 1; i < NVME_ID_UUID_LIST_MAX; i++) { + for (i = 0; i < NVME_ID_UUID_LIST_MAX; i++) { uuid_t uuid; char *association = ""; uint8_t identifier_association = uuid_list->entry[i].header & 0x3; @@ -5685,7 +5685,7 @@ void nvme_show_id_uuid_list(const struct nvme_id_uuid_list *uuid_list, break; } } - printf(" Entry[%3d]\n", i); + printf(" Entry[%3d]\n", i+1); printf(".................\n"); printf("association : 0x%x %s\n", identifier_association, association); printf("UUID : %s", nvme_uuid_to_string(uuid)); @@ -7013,23 +7013,23 @@ void nvme_feature_show_fields(enum nvme_features_id fid, unsigned int result, un printf("\tDisable Normal (DN): %s\n", (result & 0x00000001) ? "True":"False"); break; case NVME_FEAT_FID_ASYNC_EVENT: - printf("\tDiscovery Log Page Change Notices: %s\n", + printf("\tDiscovery Log Page Change Notices : %s\n", ((result & 0x80000000) >> 31) ? "Send async event":"Do not send async event"); - printf("\tEndurance Group Event Aggregate Log Change Notices: %s\n", + printf("\tEndurance Group Event Aggregate Log Change Notices : %s\n", ((result & 0x00004000) >> 14) ? "Send async event":"Do not send async event"); - printf("\tLBA Status Information Notices : %s\n", + printf("\tLBA Status Information Notices : %s\n", ((result & 0x00002000) >> 13) ? "Send async event":"Do not send async event"); - printf("\tPredictable Latency Event Aggregate Log Change Notices: %s\n", + printf("\tPredictable Latency Event Aggregate Log Change Notices : %s\n", ((result & 0x00001000) >> 12) ? "Send async event":"Do not send async event"); - printf("\tAsymmetric Namespace Access Change Notices: %s\n", + printf("\tAsymmetric Namespace Access Change Notices : %s\n", ((result & 0x00000800) >> 11) ? "Send async event":"Do not send async event"); - printf("\tTelemetry Log Notices : %s\n", + printf("\tTelemetry Log Notices : %s\n", ((result & 0x00000400) >> 10) ? "Send async event":"Do not send async event"); - printf("\tFirmware Activation Notices : %s\n", + printf("\tFirmware Activation Notices : %s\n", ((result & 0x00000200) >> 9) ? "Send async event":"Do not send async event"); - printf("\tNamespace Attribute Notices : %s\n", + printf("\tNamespace Attribute Notices : %s\n", ((result & 0x00000100) >> 8) ? "Send async event":"Do not send async event"); - printf("\tSMART / Health Critical Warnings: %s\n", + printf("\tSMART / Health Critical Warnings : %s\n", (result & 0x000000ff) ? "Send async event":"Do not send async event"); break; case NVME_FEAT_FID_AUTO_PST: -- cgit v1.2.3