From 5bd533df4782a89f06017a767d569f735e508b57 Mon Sep 17 00:00:00 2001 From: Nate Roiger Date: Thu, 16 Sep 2021 08:56:28 -0500 Subject: [PATCH] Binary output support for list-ctrl command Signed-off-by: Nate Roiger --- nvme-print.c | 2 ++ nvme.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nvme-print.c b/nvme-print.c index d321ec0c..7bb34cd3 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -4160,6 +4160,8 @@ void nvme_show_list_ctrl(struct nvme_ctrl_list *ctrl_list, int i; __u16 num = le16_to_cpu(ctrl_list->num); + if (flags & BINARY) + return d_raw((unsigned char *)ctrl_list, sizeof(*ctrl_list)); if (flags & JSON) return json_nvme_list_ctrl(ctrl_list, num); diff --git a/nvme.c b/nvme.c index c96d542b..6e56d900 100644 --- a/nvme.c +++ b/nvme.c @@ -1371,10 +1371,6 @@ static int list_ctrl(int argc, char **argv, struct command *cmd, struct plugin * err = flags = validate_output_format(cfg.output_format); if (flags < 0) goto close_fd; - if (flags != JSON && flags != NORMAL) { - err = -EINVAL; - goto close_fd; - } if (posix_memalign((void *)&cntlist, getpagesize(), 0x1000)) { fprintf(stderr, "can not allocate controller list payload\n"); -- 2.50.1