nvme: Add wrappers for Identify controller lists

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

diff --git a/nvme-wrap.c b/nvme-wrap.c
index cadddbdaf814e47d14e6456f34486d301827f590..458b0a66ac3cad54aea3aa89291fbc7d80e34f9d 100644 (file)
--- a/nvme-wrap.c
+++ b/nvme-wrap.c
@@ -58,6 +58,19 @@ int nvme_cli_identify_ctrl(struct nvme_dev *dev, struct nvme_id_ctrl *ctrl)
        return do_admin_op(identify_ctrl, dev, ctrl);
 }
 
+int nvme_cli_identify_ctrl_list(struct nvme_dev *dev, __u16 ctrl_id,
+                               struct nvme_ctrl_list *list)
+{
+       return do_admin_op(identify_ctrl_list, dev, ctrl_id, list);
+}
+
+int nvme_cli_identify_nsid_ctrl_list(struct nvme_dev *dev, __u32 nsid,
+                                    __u16 ctrl_id,
+                                    struct nvme_ctrl_list *list)
+{
+       return do_admin_op(identify_nsid_ctrl_list, dev, nsid, ctrl_id, list);
+}
+
 int nvme_cli_identify_ns(struct nvme_dev *dev, __u32 nsid,
                         struct nvme_id_ns *ns)
 {

diff --git a/nvme-wrap.h b/nvme-wrap.h
index 60ddf7e32a754aedb46d52998771f53d44f5a63e..3a197c7df3236e4addbed7113250fdb633be972d 100644 (file)
--- a/nvme-wrap.h
+++ b/nvme-wrap.h
@@ -11,6 +11,11 @@
 
 int nvme_cli_identify(struct nvme_dev *dev, struct nvme_identify_args *args);
 int nvme_cli_identify_ctrl(struct nvme_dev *dev, struct nvme_id_ctrl *ctrl);
+int nvme_cli_identify_ctrl_list(struct nvme_dev *dev, __u16 ctrl_id,
+                               struct nvme_ctrl_list *list);
+int nvme_cli_identify_nsid_ctrl_list(struct nvme_dev *dev, __u32 nsid,
+                                    __u16 ctrl_id,
+                                    struct nvme_ctrl_list *list);
 int nvme_cli_identify_ns(struct nvme_dev *dev, __u32 nsid,
                         struct nvme_id_ns *ns);
 int nvme_cli_identify_allocated_ns(struct nvme_dev *dev, __u32 nsid,

diff --git a/nvme.c b/nvme.c
index 6d161e48f24da7513f2808b5dd93f27379d59f05..68c3b2cf0cd5aea1410090e6462ff36846c202ee 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -2117,12 +2117,10 @@ static int list_ctrl(int argc, char **argv, struct command *cmd, struct plugin *
        }
 
        if (cfg.namespace_id == NVME_NSID_NONE)
-               err = nvme_identify_ctrl_list(dev_fd(dev), cfg.cntid,
-                                             cntlist);
+               err = nvme_cli_identify_ctrl_list(dev, cfg.cntid, cntlist);
        else
-               err = nvme_identify_nsid_ctrl_list(dev_fd(dev),
-                                                  cfg.namespace_id,
-                                                  cfg.cntid, cntlist);
+               err = nvme_cli_identify_nsid_ctrl_list(dev, cfg.namespace_id,
+                                                       cfg.cntid, cntlist);
        if (!err)
                nvme_show_list_ctrl(cntlist, flags);
        else if (err > 0)