From a633aef5f9d01c1435766367a173f401da98c78e Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 19 Jul 2022 14:27:02 +0800 Subject: [PATCH] nvme: Add wrappers for Identify controller lists Signed-off-by: Jeremy Kerr --- nvme-wrap.c | 13 +++++++++++++ nvme-wrap.h | 5 +++++ nvme.c | 8 +++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/nvme-wrap.c b/nvme-wrap.c index cadddbda..458b0a66 100644 --- 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 60ddf7e3..3a197c7d 100644 --- 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 6d161e48..68c3b2cf 100644 --- 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) -- 2.50.1