libnvme: use 'struct nvmf_context' as argument for __nvme_lookup_ctrl()

To simplify the interface.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/src/nvme/fabrics.c

@@ -968,13 +968,15 @@ static const char *lookup_context(struct nvme_global_ctx *ctx, nvme_ctrl_t c)
 
 	nvme_for_each_host(ctx, h) {
 		nvme_for_each_subsystem(h, s) {
-			if (__nvme_lookup_ctrl(s, nvme_ctrl_get_transport(c),
-					       nvme_ctrl_get_traddr(c),
-					       NULL,
-					       NULL,
-					       nvme_ctrl_get_trsvcid(c),
-					       NULL,
-					       NULL))
+			struct nvmf_context fctx = {
+				.transport = nvme_ctrl_get_transport(c),
+				.traddr = nvme_ctrl_get_traddr(c),
+				.host_traddr = NULL,
+				.host_iface = NULL,
+				.trsvcid = nvme_ctrl_get_trsvcid(c),
+				.subsysnqn = NULL,
+			};
+			if (__nvme_lookup_ctrl(s, &fctx, NULL))
 				return nvme_subsystem_get_application(s);
 		}
 	}
@@ -997,14 +999,16 @@ __public int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 	s = nvme_lookup_subsystem(h, NULL, nvme_ctrl_get_subsysnqn(c));
 	if (s) {
 		nvme_ctrl_t fc;
-
-		fc = __nvme_lookup_ctrl(s, nvme_ctrl_get_transport(c),
-					nvme_ctrl_get_traddr(c),
-					nvme_ctrl_get_host_traddr(c),
-					nvme_ctrl_get_host_iface(c),
-					nvme_ctrl_get_trsvcid(c),
-					NULL,
-					NULL);
+		struct nvmf_context fctx = {
+			.transport = nvme_ctrl_get_transport(c),
+			.traddr = nvme_ctrl_get_traddr(c),
+			.host_traddr = nvme_ctrl_get_host_traddr(c),
+			.host_iface = nvme_ctrl_get_trsvcid(c),
+			.trsvcid = nvme_ctrl_get_trsvcid(c),
+			.subsysnqn = NULL,
+		};
+
+		fc = __nvme_lookup_ctrl(s, &fctx, NULL);
 		if (fc) {
 			const char *key;
 
@@ -2439,7 +2443,6 @@ __public int nvmf_config_modify(struct nvme_global_ctx *ctx,
 		nvme_msg(ctx, LOG_ERR, "Failed to lookup controller\n");
 		return -ENODEV;
 	}
-
 	if (fctx->ctrlkey)
 		nvme_ctrl_set_dhchap_ctrl_key(c, fctx->ctrlkey);
 

libnvme/src/nvme/private.h

@@ -381,10 +381,9 @@ int __nvme_transport_handle_open_mi(struct nvme_transport_handle *hdl, const cha
 int __nvme_transport_handle_init_mi(struct nvme_transport_handle *hdl);
 void __nvme_transport_handle_close_mi(struct nvme_transport_handle *hdl);
 
-nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,
-			       const char *traddr, const char *host_traddr,
-			       const char *host_iface, const char *trsvcid,
-			       const char *subsysnqn, nvme_ctrl_t p);
+nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s,
+			       struct nvmf_context *fctx,
+			       nvme_ctrl_t p);
 
 void *__nvme_alloc(size_t len);
 

libnvme/src/nvme/tree.c

@@ -1437,19 +1437,18 @@ static ctrl_match_t _candidate_init(struct nvme_global_ctx *ctx,
 	return _match_ctrl;
 }
 
-nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,
-			       const char *traddr, const char *host_traddr,
-			       const char *host_iface, const char *trsvcid,
-			       const char *subsysnqn, nvme_ctrl_t p)
+nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s, struct nvmf_context *fctx,
+			       nvme_ctrl_t p)
 {
 	struct candidate_args candidate = {};
 	struct nvme_ctrl *c, *matching_c = NULL;
 	ctrl_match_t ctrl_match;
 
 	/* Init candidate and get the matching function to use */
-	ctrl_match = _candidate_init(s->h->ctx, &candidate, transport, traddr,
-				     trsvcid, subsysnqn, host_traddr,
-				     host_iface);
+	ctrl_match = _candidate_init(s->h->ctx, &candidate,
+				     fctx->transport, fctx->traddr,
+				     fctx->trsvcid, fctx->subsysnqn,
+				     fctx->host_traddr, fctx->host_iface);
 
 	c = p ? nvme_subsystem_next_ctrl(s, p) : nvme_subsystem_first_ctrl(s);
 	for (; c != NULL; c = nvme_subsystem_next_ctrl(s, c)) {
@@ -1483,8 +1482,16 @@ nvme_ctrl_t nvme_ctrl_find(nvme_subsystem_t s, const char *transport,
 			   const char *subsysnqn, const char *host_traddr,
 			   const char *host_iface)
 {
-	return __nvme_lookup_ctrl(s, transport, traddr, host_traddr, host_iface,
-				  trsvcid, subsysnqn, NULL/*p*/);
+	struct nvmf_context fctx = {
+		.transport = transport,
+		.traddr = traddr,
+		.host_traddr = host_traddr,
+		.host_iface = host_iface,
+		.trsvcid = trsvcid,
+		.subsysnqn = subsysnqn,
+	};
+
+	return __nvme_lookup_ctrl(s, &fctx, NULL/*p*/);
 }
 
 nvme_ctrl_t nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,
@@ -1499,8 +1506,16 @@ nvme_ctrl_t nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,
 	if (!s || !transport)
 		return NULL;
 
-	c = __nvme_lookup_ctrl(s, transport, traddr, host_traddr,
-			       host_iface, trsvcid, NULL, p);
+	struct nvmf_context fctx = {
+		.transport = transport,
+		.traddr = traddr,
+		.host_traddr = host_traddr,
+		.host_iface = host_iface,
+		.trsvcid = trsvcid,
+		.subsysnqn = NULL,
+	};
+
+	c = __nvme_lookup_ctrl(s, &fctx, p);
 	if (c)
 		return c;