tree: make nvme_lookup_ctrl and nvme_ctrl_find private

There are no public users for these function. Make them private so we
can refactor them without breaking the API in future.

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

Author: igaw

libnvme/src/libnvme.ld

@@ -9,7 +9,6 @@ LIBNVME_2_0 {
 		nvme_create_ctrl;
 		nvme_create_global_ctx;
 		nvme_ctrl_config_match;
-		nvme_ctrl_find;
 		nvme_ctrl_first_ns;
 		nvme_ctrl_first_path;
 		nvme_ctrl_get_address;
@@ -126,7 +125,6 @@ LIBNVME_2_0 {
 		nvme_insert_tls_key_compat;
 		nvme_insert_tls_key_versioned;
 		nvme_ipaddrs_eq;
-		nvme_lookup_ctrl;
 		nvme_lookup_key;
 		nvme_lookup_keyring;
 		nvme_mi_admin_admin_passthru;

libnvme/src/nvme/private.h

@@ -416,7 +416,14 @@ nvme_host_t nvme_lookup_host(struct nvme_global_ctx *ctx, const char *hostnqn,
 nvme_subsystem_t nvme_lookup_subsystem(struct nvme_host *h,
 				       const char *name,
 				       const char *subsysnqn);
-
+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);
 
 #if (LOG_FUNCNAME == 1)
 #define __nvme_log_func __func__

libnvme/src/nvme/tree.h

@@ -300,54 +300,6 @@ nvme_path_t nvme_namespace_first_path(nvme_ns_t ns);
  */
 nvme_path_t nvme_namespace_next_path(nvme_ns_t ns, nvme_path_t p);
 
-/**
- * nvme_lookup_ctrl() - Lookup nvme_ctrl_t object
- * @s:			&nvme_subsystem_t object
- * @transport:		Transport name
- * @traddr:		Transport address
- * @host_traddr:	Host transport address
- * @host_iface:		Host interface name
- * @trsvcid:		Transport service identifier
- * @p:			Previous controller instance
- *
- * Lookup a controller in @s based on @transport, @traddr,
- * @host_traddr, @host_iface, and @trsvcid. @transport must be specified,
- * other fields may be required depending on the transport. A new
- * object is created if none is found. If @p is specified the lookup
- * will start at @p instead of the first controller.
- *
- * Return: Controller instance
- */
-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_find() - Locate an existing controller
- * @s:			&nvme_subsystem_t object
- * @transport:		Transport name
- * @traddr:		Transport address
- * @trsvcid:		Transport service identifier
- * @subsysnqn:		Subsystem NQN
- * @host_traddr:	Host transport address
- * @host_iface:		Host interface name
- *
- * Lookup a controller in @s based on @transport, @traddr, @trsvcid,
- * @subsysnqn, @host_traddr, and @host_iface. @transport must be specified,
- * other fields may be required depending on the transport. Parameters set
- * to NULL will be ignored.
- *
- * Unlike nvme_lookup_ctrl(), this function does not create a new object if
- * an existing controller cannot be found.
- *
- * Return: Controller instance on success, NULL otherwise.
- */
-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_config_match() - Check if ctrl @c matches config params
  * @c:			An existing controller instance

libnvme/test/meson.build

@@ -130,7 +130,7 @@ if conf.get('HAVE_NETDB')
         dependencies: [
             config_dep,
             ccan_dep,
-            libnvme_dep,
+            libnvme_test_dep,
         ],
         link_with: mock_ifaddrs,
     )