Refactoring and reorganize the public headers

libnvme/doc/meson.build

@@ -13,7 +13,6 @@ api_files = [
     'filters.h',
     'ioctl.h',
     'linux.h',
-    'log.h',
     'mi.h',
     'nbft.h',
     'tree.h',

libnvme/examples/mi-mctp-ae.c

@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 	//Cleanup
 	nvme_mi_aem_disable(ep);
 	nvme_mi_close(ep);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }

libnvme/examples/mi-mctp-csi-test.c

@@ -237,12 +237,12 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
 	rc = do_action_endpoint(action, ctx, net, eid, argc, argv);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }

libnvme/examples/mi-mctp.c

@@ -846,9 +846,9 @@ int main(int argc, char **argv)
 			printf("---\n");
 			free(desc);
 		}
-		nvme_mi_free_global_ctx(ctx);
+		nvme_free_global_ctx(ctx);
 	} else {
-		ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+		ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 		if (!ctx)
 			err(EXIT_FAILURE, "can't create NVMe root");
 
@@ -857,7 +857,7 @@ int main(int argc, char **argv)
 			errx(EXIT_FAILURE, "can't open MCTP endpoint %d:%d", net, eid);
 		rc = do_action_endpoint(action, ep, argc, argv);
 		nvme_mi_close(ep);
-		nvme_mi_free_global_ctx(ctx);
+		nvme_free_global_ctx(ctx);
 	}
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;

libnvme/libnvme/nvme.i

@@ -28,13 +28,8 @@
 %{
 	#include <ccan/list/list.h>
 	#include <ccan/endian/endian.h>
-	#include "nvme/tree.h"
-	#include "nvme/fabrics.h"
+	#include <libnvme.h>
 	#include "nvme/private.h"
-	#include "nvme/log.h"
-	#include "nvme/ioctl.h"
-	#include "nvme/types.h"
-	#include "nvme/nbft.h"
 
 	static int connect_err = 0;
 	static int discover_err = 0;
@@ -515,7 +510,7 @@ struct nvme_ns {
 		else if (!strcmp(level, "crit")) log_level = LOG_CRIT;
 		else if (!strcmp(level, "alert")) log_level = LOG_ALERT;
 		else if (!strcmp(level, "emerg")) log_level = LOG_EMERG;
-		nvme_init_logging($self, log_level, false, false);
+		nvme_set_logging_level($self, log_level, false, false);
 	}
 	%pythoncode %{
 	def hosts(self):

libnvme/src/libnvme-mi.h

@@ -13,9 +13,10 @@
 extern "C" {
 #endif
 
+#include <nvme/lib.h>
 #include <nvme/types.h>
+#include <nvme/cmds.h>
 #include <nvme/mi.h>
-#include <nvme/log.h>
 
 #ifdef __cplusplus
 }

libnvme/src/libnvme.h

@@ -14,15 +14,17 @@
 extern "C" {
 #endif
 
-#include <nvme/types.h>
-#include <nvme/linux.h>
-#include <nvme/ioctl.h>
-#include <nvme/nbft.h>
+#include <nvme/cmds.h>
 #include <nvme/fabrics.h>
 #include <nvme/filters.h>
+#include <nvme/ioctl.h>
+#include <nvme/lib-types.h>
+#include <nvme/lib.h>
+#include <nvme/linux.h>
+#include <nvme/nbft.h>
 #include <nvme/tree.h>
+#include <nvme/types.h>
 #include <nvme/util.h>
-#include <nvme/log.h>
 
 #ifdef __cplusplus
 }

libnvme/src/libnvme.ld

@@ -69,7 +69,6 @@ LIBNVME_2_0 {
 		nvme_free_host;
 		nvme_free_ns;
 		nvme_free_subsystem;
-		nvme_free_uri;
 		nvme_fw_download_seq;
 		nvme_gen_dhchap_key;
 		nvme_generate_tls_key_identity;
@@ -85,6 +84,7 @@ LIBNVME_2_0 {
 		nvme_get_feature_length;
 		nvme_get_host_telemetry;
 		nvme_get_log;
+		nvme_get_logging_level;
 		nvme_get_logical_block_size;
 		nvme_get_new_host_telemetry;
 		nvme_get_ns_attr;
@@ -117,14 +117,11 @@ LIBNVME_2_0 {
 		nvme_init_ctrl;
 		nvme_init_ctrl_list;
 		nvme_init_dsm_range;
-		nvme_init_logging;
 		nvme_insert_tls_key;
 		nvme_insert_tls_key_compat;
 		nvme_insert_tls_key_versioned;
-		nvme_ipaddrs_eq;
 		nvme_lookup_key;
 		nvme_lookup_keyring;
-		nvme_mi_admin_admin_passthru;
 		nvme_mi_admin_xfer;
 		nvme_mi_aem_disable;
 		nvme_mi_aem_enable;
@@ -158,7 +155,6 @@ LIBNVME_2_0 {
 		nvme_mi_scan_ep;
 		nvme_mi_scan_mctp;
 		nvme_mi_set_csi;
-		nvme_mi_set_probe_enabled;
 		nvme_mi_status_to_string;
 		nvme_mi_submit_entry;
 		nvme_mi_submit_exit;
@@ -190,11 +186,9 @@ LIBNVME_2_0 {
 		nvme_ns_get_serial;
 		nvme_ns_get_subsystem;
 		nvme_ns_get_sysfs_dir;
-		nvme_ns_get_transport_handle;
 		nvme_ns_get_uuid;
 		nvme_ns_identify;
 		nvme_ns_read;
-		nvme_ns_release_transport_handle;
 		nvme_ns_rescan;
 		nvme_ns_verify;
 		nvme_ns_write;
@@ -231,6 +225,8 @@ LIBNVME_2_0 {
 		nvme_set_etdas;
 		nvme_set_ioctl_probing;
 		nvme_set_keyring;
+		nvme_set_logging_level;
+		nvme_set_probe_enabled;
 		nvme_set_property;
 		nvme_set_root;
 		nvme_skip_namespaces;
@@ -323,6 +319,7 @@ LIBNVME_2_0 {
 		nvmf_discovery_nbft;
 		nvmf_eflags_str;
 		nvmf_exat_ptr_next;
+		nvmf_free_uri;
 		nvmf_get_default_trsvcid;
 		nvmf_get_discovery_log;
 		nvmf_get_discovery_wargs;

libnvme/src/meson.build

@@ -7,10 +7,12 @@
 #
 sources = [
     'nvme/base64.c',
+    'nvme/cmds.c',
     'nvme/crc32.c',
     'nvme/fabrics.c',
     'nvme/filters.c',
     'nvme/ioctl.c',
+    'nvme/lib.c',
     'nvme/linux.c',
     'nvme/log.c',
     'nvme/mi-mctp.c',
@@ -96,16 +98,18 @@ install_headers(
 )
 install_headers(
     [
+        'nvme/cmds.h',
         'nvme/fabrics.h',
         'nvme/filters.h',
         'nvme/ioctl.h',
+        'nvme/lib-types.h',
+        'nvme/lib.h',
         'nvme/linux.h',
-        'nvme/log.h',
+        'nvme/mi.h',
         'nvme/nbft.h',
         'nvme/tree.h',
         'nvme/types.h',
         'nvme/util.h',
-        'nvme/mi.h',
     ],
     subdir: 'nvme',
     install_mode: mode,

libnvme/src/nvme/base64.c

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: LGPL-2.1-or-later
 /*
  * base64.c - RFC4648-compliant base64 encoding
  *
@@ -8,7 +8,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>

libnvme/src/nvme/base64.h

@@ -1,8 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef _BASE64_H
-#define _BASE64_H
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * This file is part of libnvme.
+ */
+#pragma once
 
 int base64_encode(const unsigned char *src, int len, char *dst);
 int base64_decode(const char *src, int len, unsigned char *dst);
-
-#endif /* _BASE64_H */

libnvme/src/nvme/cleanup.h

@@ -49,7 +49,7 @@ static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddri
 static inline void free_uri(struct nvme_fabrics_uri **uri)
 {
 	if (*uri)
-		nvme_free_uri(*uri);
+		nvmf_free_uri(*uri);
 }
 #define _cleanup_uri_ __cleanup__(free_uri)