libnvme; use 'struct nvmf_context' as argument to nvme_ctrl_find()

To simplify the interface.

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

Author: hreinecke

libnvme/src/nvme/fabrics.c

@@ -1816,13 +1816,7 @@ static nvme_ctrl_t lookup_ctrl(nvme_host_t h, struct nvmf_context *fctx)
 	nvme_ctrl_t c;
 
 	nvme_for_each_subsystem(h, s) {
-		c = nvme_ctrl_find(s,
-				   fctx->transport,
-				   fctx->traddr,
-				   fctx->trsvcid,
-				   fctx->subsysnqn,
-				   fctx->host_traddr,
-				   fctx->host_iface);
+		c = nvme_ctrl_find(s, fctx);
 		if (c)
 			return c;
 	}

libnvme/src/nvme/private.h

@@ -398,10 +398,7 @@ 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,
 			     nvme_ctrl_t p);
-nvme_ctrl_t nvme_ctrl_find(nvme_subsystem_t s, const char *transport,
-			   const char *traddr, const char *trsvcid,
-			   const char *subsysnqn, const char *host_traddr,
-			   const char *host_iface);
+nvme_ctrl_t nvme_ctrl_find(nvme_subsystem_t s, struct nvmf_context *fctx);
 
 void __nvme_free_host(nvme_host_t h);
 

libnvme/src/nvme/tree.c

@@ -1477,21 +1477,9 @@ __public bool nvme_ctrl_match_config(struct nvme_ctrl *c, const char *transport,
 	return ctrl_match(c, &candidate);
 }
 
-nvme_ctrl_t nvme_ctrl_find(nvme_subsystem_t s, const char *transport,
-			   const char *traddr, const char *trsvcid,
-			   const char *subsysnqn, const char *host_traddr,
-			   const char *host_iface)
+nvme_ctrl_t nvme_ctrl_find(nvme_subsystem_t s, struct nvmf_context *fctx)
 {
-	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*/);
+	return __nvme_lookup_ctrl(s, fctx, NULL/*p*/);
 }
 
 nvme_ctrl_t nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,

libnvme/test/tree.c

@@ -455,6 +455,14 @@ static bool ctrl_match(const char *tag,
 		       bool should_match)
 {
 	struct nvme_global_ctx *ctx;
+	struct nvmf_context fctx = {
+		.transport = candidate->transport,
+		.traddr = candidate->traddr,
+		.host_traddr = candidate->host_traddr,
+		.host_iface = candidate->host_iface,
+		.trsvcid = candidate->trsvcid,
+		.subsysnqn = candidate->subsysnqn,
+	};
 	nvme_host_t h;
 	nvme_ctrl_t reference_ctrl; /* Existing controller (from sysfs) */
 	nvme_ctrl_t candidate_ctrl;
@@ -483,10 +491,7 @@ static bool ctrl_match(const char *tag,
 	}
 
 	/* nvme_ctrl_find() MUST BE RUN BEFORE nvme_lookup_ctrl() */
-	found_ctrl = nvme_ctrl_find(s, candidate->transport, candidate->traddr,
-				    candidate->trsvcid, candidate->subsysnqn,
-				    candidate->host_traddr,
-				    candidate->host_iface);
+	found_ctrl = nvme_ctrl_find(s, &fctx);
 
 	candidate_ctrl = nvme_lookup_ctrl(s, candidate->transport, candidate->traddr,
 					  candidate->host_traddr, candidate->host_iface,