}
}
-static void json_nvme_id_ns(struct nvme_id_ns *ns, unsigned int mode)
+static void json_nvme_id_ns(struct nvme_id_ns *ns)
{
char nguid_buf[2 * sizeof(ns->nguid) + 1],
eui64_buf[2 * sizeof(ns->eui64) + 1];
json_free_object(root);
}
-static void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode,
+static void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl,
void (*vs)(__u8 *vs, struct json_object *root))
{
struct json_object *root;
}
}
-void json_persistent_event_log(void *pevent_log_info,
- __u32 size, enum nvme_print_flags flags)
+void json_persistent_event_log(void *pevent_log_info, __u32 size)
{
struct json_object *root;
struct json_object *valid_attrs;
if (flags & BINARY)
return d_raw((unsigned char *)pevent_log_info, size);
if (flags & JSON)
- return json_persistent_event_log(pevent_log_info, size,
- flags);
+ return json_persistent_event_log(pevent_log_info, size);
offset = sizeof(*pevent_log_head);
if (flags & BINARY)
return d_raw((unsigned char *)ns, sizeof(*ns));
if (flags & JSON)
- return json_nvme_id_ns(ns, flags);
+ return json_nvme_id_ns(ns);
printf("NVME Identify Namespace %d:\n", nsid);
printf("nsze : %#"PRIx64"\n", le64_to_cpu(ns->nsze));
if (flags & BINARY)
return d_raw((unsigned char *)ctrl, sizeof(*ctrl));
else if (flags & JSON)
- return json_nvme_id_ctrl(ctrl, flags, vendor_show);
+ return json_nvme_id_ctrl(ctrl, vendor_show);
printf("NVME Identify Controller:\n");
printf("vid : %#x\n", le16_to_cpu(ctrl->vid));
printf("dmsl : %"PRIu64"\n", le64_to_cpu(ctrl_nvm->dmsl));
}
-static void json_nvme_zns_id_ctrl(struct nvme_zns_id_ctrl *ctrl, unsigned int mode)
+static void json_nvme_zns_id_ctrl(struct nvme_zns_id_ctrl *ctrl)
{
struct json_object *root;
if (mode & BINARY)
return d_raw((unsigned char *)ctrl, sizeof(*ctrl));
else if (mode & JSON)
- return json_nvme_zns_id_ctrl(ctrl, mode);
+ return json_nvme_zns_id_ctrl(ctrl);
printf("NVMe ZNS Identify Controller:\n");
printf("zasl : %u\n", ctrl->zasl);
}
void json_nvme_zns_id_ns(struct nvme_zns_id_ns *ns,
- struct nvme_id_ns *id_ns, unsigned long flags)
+ struct nvme_id_ns *id_ns)
{
struct json_object *root;
struct json_array *lbafs;
if (flags & BINARY)
return d_raw((unsigned char *)ns, sizeof(*ns));
else if (flags & JSON)
- return json_nvme_zns_id_ns(ns, id_ns, flags);
+ return json_nvme_zns_id_ns(ns, id_ns);
printf("ZNS Command Set Identify Namespace:\n");
struct nvme_predlat_event_agg_log_page *pea_log,
__u64 log_entries, __u32 size, const char *devname,
enum nvme_print_flags flags);
-void json_persistent_event_log(void *pevent_log_info,
- __u32 size, enum nvme_print_flags flags);
+void json_persistent_event_log(void *pevent_log_info, __u32 size);
void nvme_show_persistent_event_log(void *pevent_log_info,
__u8 action, __u32 size, const char *devname,
enum nvme_print_flags flags);