fabrics: move nbft code to the library

Move more discovery code to the library.

Signed-off-by: Daniel Wagner <wagi@kernel.org>

Author: igaw

fabrics.c

@@ -42,7 +42,6 @@
 
 #include "common.h"
 #include "nvme.h"
-#include "nbft.h"
 #include "nvme-print.h"
 #include "fabrics.h"
 #include "util/cleanup.h"
@@ -342,6 +341,32 @@ static bool nvmf_decide_retry(struct nvmf_discovery_ctx *dctx, int err,
 	return false;
 }
 
+static void nvmf_connected(struct nvmf_discovery_ctx *dctx,
+		struct nvme_ctrl *c, void *user_data)
+{
+	struct cb_discovery_log_data *dld = user_data;
+
+	if (dld->flags == NORMAL) {
+		printf("device: %s\n", nvme_ctrl_get_name(c));
+		return;
+	}
+
+#ifdef CONFIG_JSONC
+	if (dld->flags == JSON) {
+		struct json_object *root;
+
+		root = json_create_object();
+
+		json_object_add_value_string(root, "device",
+			nvme_ctrl_get_name(c));
+
+		json_print_object(root, NULL);
+		printf("\n");
+		json_free_object(root);
+	}
+#endif
+}
+
 static int create_discovery_log_ctx(struct nvme_global_ctx *ctx,
 		bool persistent,
 		struct nvme_fabrics_config *defcfg,
@@ -374,6 +399,10 @@ static int create_discovery_log_ctx(struct nvme_global_ctx *ctx,
 	if (err)
 		goto err;
 
+	err = nvmf_discovery_ctx_connected_set(dctx, nvmf_connected);
+	if (err)
+		goto err;
+
 	err = nvmf_discovery_ctx_persistent_set(dctx, persistent);
 	if (err)
 		goto err;
@@ -544,6 +573,8 @@ static int nvme_read_config_checked(struct nvme_global_ctx *ctx,
 	return nvme_read_config(ctx, filename);
 }
 
+#define NBFT_SYSFS_PATH		"/sys/firmware/acpi/tables"
+
 /* returns negative errno values */
 int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 {
@@ -654,12 +685,10 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 		return ret;
 
 	if (!device && !transport && !traddr) {
-		nvmf_discovery_ctx_persistent_set(dctx, true);
-
 		if (!nonbft)
-			ret = discover_from_nbft(ctx, hostnqn, hostid,
-						  hnqn, hid, desc, connect,
-						  &cfg, nbft_path, flags, verbose);
+			ret = nvmf_discovery_nbft(ctx, dctx, hostnqn, hostid,
+						  hnqn, hid, connect,
+						  &cfg, nbft_path);
 		if (nbft)
 			goto out_free;
 

libnvme/src/libnvme.map

@@ -295,13 +295,15 @@ LIBNVME_2_0 {
 		nvmf_discovery;
 		nvmf_discovery_config_json;
 		nvmf_discovery_ctx_already_connected_set;
+		nvmf_discovery_ctx_connected_set;
 		nvmf_discovery_ctx_create;
 		nvmf_discovery_ctx_decide_retry_set;
 		nvmf_discovery_ctx_default_fabrics_config_set;
 		nvmf_discovery_ctx_discovery_log_set;
 		nvmf_discovery_ctx_keep_alive_timeout;
 		nvmf_discovery_ctx_max_retries;
 		nvmf_discovery_ctx_persistent_set;
+		nvmf_discovery_nbft;
 		nvmf_eflags_str;
 		nvmf_exat_ptr_next;
 		nvmf_get_default_trsvcid;
@@ -313,6 +315,8 @@ LIBNVME_2_0 {
 		nvmf_hostnqn_generate;
 		nvmf_hostnqn_generate_from_hostid;
 		nvmf_is_registration_supported;
+		nvmf_nbft_free;
+		nvmf_nbft_read_files;
 		nvmf_prtype_str;
 		nvmf_qptype_str;
 		nvmf_register_ctrl;

libnvme/src/nvme/cleanup.h

@@ -10,6 +10,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include "fabrics.h"
+
 #define __cleanup__(fn) __attribute__((cleanup(fn)))
 
 #define DECLARE_CLEANUP_FUNC(name, type) \
@@ -44,4 +46,11 @@ static inline void cleanup_fd(int *fd)
 static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)
 #define _cleanup_addrinfo_ __cleanup__(cleanup_addrinfo)
 
+static inline void free_uri(struct nvme_fabrics_uri **uri)
+{
+	if (*uri)
+		nvme_free_uri(*uri);
+}
+#define _cleanup_uri_ __cleanup__(free_uri)
+
 #endif