fabrics: add ctrl connect interface

A controller can already be created by the config, thus it is already in
the tree. Adding to the tree is wrong and will lead to double frees when
releasing the tree.

Signed-off-by: Daniel Wagner <[email protected]>

Author: dwsuse

src/libnvme.map

@@ -9,6 +9,7 @@ LIBNVME_1.11 {
 		nvme_ctrl_set_tls_key_identity;
 		nvme_export_tls_key_versioned;
 		nvme_import_tls_key_versioned;
+		nvmf_connect_ctrl;
 };
 
 

src/nvme/fabrics.c

@@ -979,6 +979,24 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 	return nvme_init_ctrl(h, c, ret);
 }
 
+int nvmf_connect_ctrl(nvme_ctrl_t c)
+{
+	_cleanup_free_ char *argstr = NULL;
+	int ret;
+
+	ret = build_options(c->s->h, c, &argstr);
+	if (ret)
+		return ret;
+
+	ret = __nvmf_add_ctrl(c->s->h->r, argstr);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	return 0;
+}
+
 nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h,
 				    struct nvmf_disc_log_entry *e,
 				    const struct nvme_fabrics_config *cfg,

src/nvme/fabrics.h

@@ -223,6 +223,17 @@ void nvmf_update_config(nvme_ctrl_t c, const struct nvme_fabrics_config *cfg);
 int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 		  const struct nvme_fabrics_config *cfg);
 
+/**
+ * nvmf_connect_ctrl() - Connect a controller
+ * @c:		Controller to be connected
+ *
+ * Issues a 'connect' command to the NVMe-oF controller.
+ * @c must be initialized and not connected to the topology.
+ *
+ * Return: 0 on success; on failure errno is set and -1 is returned.
+ */
+int nvmf_connect_ctrl(nvme_ctrl_t c);
+
 /**
  * nvmf_get_discovery_log() - Return the discovery log page
  * @c:			Discovery controller to use