Binary output support for list-ctrl command

Signed-off-by: Nate Roiger <nate.roiger@hpe.com>

diff --git a/nvme-print.c b/nvme-print.c
index d321ec0c96849896ee6b23516ec9527973bba7c8..7bb34cd3dc297a7890ca6aabafdc346f063919ff 100644 (file)
--- 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 c96d542bda32e3f2addd15ee97333de28a03fbf0..6e56d900a5094026dc53f9231a3457d24b2e0e3e 100644 (file)
--- 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");