Add Python init() method. Move nvme_init_ctrl() from private.h to tree.h

Addess review comments.

Signed-off-by: Martin Belanger <martin.belanger@dell.com>

diff --git a/pynvme/nvme.i b/pynvme/nvme.i
index 919361727ff466a9a76d80b822fba2fc265e7bce..ca7fb5a7dc47d042da2364dffd354c506574ce1b 100644 (file)
--- a/pynvme/nvme.i
+++ b/pynvme/nvme.i
@@ -502,6 +502,11 @@ struct nvme_ns {
   ~nvme_ctrl() {
     nvme_free_ctrl($self);
   }
+
+  bool init(struct nvme_host *h, int instance) {
+      return nvme_init_ctrl(h, $self, instance) == 0;
+  }
+
   void connect(struct nvme_host *h, struct nvme_fabrics_config *cfg = NULL) {
     int ret;
     const char *dev;

diff --git a/src/libnvme.map b/src/libnvme.map
index 322097f21d7eb466a33737b27ba6a9761196d44e..d8fff8b635c94743327e9b1feab1aa5115e3c21e 100644 (file)
--- a/src/libnvme.map
+++ b/src/libnvme.map
@@ -143,6 +143,7 @@
                nvme_identify_secondary_ctrl_list;
                nvme_identify_uuid;
                nvme_init_copy_range;
+               nvme_init_ctrl;
                nvme_init_ctrl_list;
                nvme_init_dsm_range;
                nvme_init_id_ns;

diff --git a/src/nvme/private.h b/src/nvme/private.h
index 29e96bf322ba94125b4d04d7c1167b4cc8baecc8..2a151bf8613ba1bdd015c519357880ca8bdc2281 100644 (file)
--- a/src/nvme/private.h
+++ b/src/nvme/private.h
@@ -111,8 +111,6 @@ struct nvme_root {
        bool modified;
 };
 
-int nvme_init_ctrl(nvme_host_t h, nvme_ctrl_t c, int instance);
-
 int nvme_set_attr(const char *dir, const char *attr, const char *value);
 
 void json_read_config(nvme_root_t r, const char *config_file);

diff --git a/src/nvme/tree.h b/src/nvme/tree.h
index f9e7d3713e5d17714a58b6b20af91733e381d065..fc01b5ef88f7143eec7dc3fc0fc08e8278f659b7 100644 (file)
--- a/src/nvme/tree.h
+++ b/src/nvme/tree.h
@@ -853,6 +853,16 @@ nvme_ctrl_t nvme_scan_ctrl(nvme_root_t r, const char *name);
  */
 void nvme_rescan_ctrl(nvme_ctrl_t c);
 
+/**
+ * nvme_init_ctrl() - Initialize control for an existing nvme device.
+ * @h: host
+ * @c: ctrl
+ * @instance: Instance number (e.g. 1 for nvme1)
+ *
+ * Return: The ioctl() return code. Typically 0 on success.
+ */
+int nvme_init_ctrl(nvme_host_t h, nvme_ctrl_t c, int instance);
+
 /**
  * nvme_free_ctrl() -
  * @c: