diff --git a/nvme-print-binary.c b/nvme-print-binary.c index ec86e38624..351513b90a 100644 --- a/nvme-print-binary.c +++ b/nvme-print-binary.c @@ -27,7 +27,7 @@ static void binary_persistent_event_log(void *pevent_log_info, } static void binary_endurance_group_event_agg_log( - struct nvme_aggregate_predictable_lat_event *endurance_log, + struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname) { d_raw((unsigned char *)endurance_log, size); diff --git a/nvme-print-json.c b/nvme-print-json.c index bbb948f53e..3b6d40514e 100644 --- a/nvme-print-json.c +++ b/nvme-print-json.c @@ -1917,7 +1917,7 @@ static void json_persistent_event_log(void *pevent_log_info, __u8 action, } static void json_endurance_group_event_agg_log( - struct nvme_aggregate_predictable_lat_event *endurance_log, + struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname) { struct json_object *r = json_create_object(); diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c index 3c7fcf2ad0..1593e14136 100644 --- a/nvme-print-stdout.c +++ b/nvme-print-stdout.c @@ -567,7 +567,7 @@ static void stdout_persistent_event_log(void *pevent_log_info, __u8 action, __u3 } static void stdout_endurance_group_event_agg_log( - struct nvme_aggregate_predictable_lat_event *endurance_log, + struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname) { printf("Endurance Group Event Aggregate Log for device: %s\n", devname); @@ -6050,6 +6050,9 @@ static void stdout_relatives(nvme_root_t r, const char *name) static void stdout_log(const char *devname, struct nvme_get_log_args *args) { + struct nvme_aggregate_endurance_group_event *end = args->log; + struct nvme_supported_cap_config_list_log *cap = args->log; + switch (args->lid) { case NVME_LOG_LID_SUPPORTED_LOG_PAGES: break; @@ -6100,10 +6103,13 @@ static void stdout_log(const char *devname, struct nvme_get_log_args *args) stdout_lba_status_log((void *)args->log, args->len, devname); break; case NVME_LOG_LID_ENDURANCE_GRP_EVT: + stdout_endurance_group_event_agg_log(end, end->num_entries, args->len, devname); break; case NVME_LOG_LID_MEDIA_UNIT_STATUS: + stdout_media_unit_stat_log((struct nvme_media_unit_stat_log *)args->log); break; case NVME_LOG_LID_SUPPORTED_CAP_CONFIG_LIST: + stdout_supported_cap_config_log(cap); break; case NVME_LOG_LID_FID_SUPPORTED_EFFECTS: break; diff --git a/nvme-print.c b/nvme-print.c index 15b5c90914..3a71dffcbe 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -263,7 +263,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info, } void nvme_show_endurance_group_event_agg_log( - struct nvme_aggregate_predictable_lat_event *endurance_log, + struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname, nvme_print_flags_t flags) { diff --git a/nvme-print.h b/nvme-print.h index feed09c3cc..4ccf5e6351 100644 --- a/nvme-print.h +++ b/nvme-print.h @@ -32,7 +32,7 @@ struct print_ops { void (*directive)(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __u32 result, void *buf, __u32 len); void (*discovery_log)(struct nvmf_discovery_log *log, int numrec); void (*effects_log_list)(struct list_head *list); - void (*endurance_group_event_agg_log)(struct nvme_aggregate_predictable_lat_event *endurance_log, __u64 log_entries, __u32 size, const char *devname); + void (*endurance_group_event_agg_log)(struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname); void (*endurance_group_list)(struct nvme_id_endurance_group_list *endgrp_list); void (*endurance_log)(struct nvme_endurance_group_log *endurance_group, __u16 group_id, const char *devname); void (*error_log)(struct nvme_error_log_page *err_log, int entries, const char *devname); @@ -201,7 +201,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info, __u8 action, __u32 size, const char *devname, nvme_print_flags_t flags); void nvme_show_endurance_group_event_agg_log( - struct nvme_aggregate_predictable_lat_event *endurance_log, + struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname, nvme_print_flags_t flags); void nvme_show_lba_status_log(void *lba_status, __u32 size,