src: merge api-types.h content into types.h

igaw · igaw · commit fee84f04e02a · 2025-11-06T11:20:17.000+01:00
There is no need for the api-types.h header anymore. Furthermore, the
struct nvme_transport_handle and struct nvme_global_ctx type is used
throughout the library and is now part of the main API. We should ensure
any user of &lt;nvme/libnvme.h&gt; gets this type.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/libnvme/doc/meson.build b/libnvme/doc/meson.build
@@ -9,7 +9,6 @@
 #
 
 api_files = [
-  'api-types.h',
   'fabrics.h',
   'filters.h',
   'ioctl.h',
diff --git a/libnvme/src/meson.build b/libnvme/src/meson.build
@@ -94,7 +94,6 @@ install_headers([
     install_mode: mode,
 )
 install_headers([
-        'nvme/api-types.h',
         'nvme/fabrics.h',
         'nvme/filters.h',
         'nvme/ioctl.h',
diff --git a/libnvme/src/nvme/api-types.h b/libnvme/src/nvme/api-types.h
diff --git a/libnvme/src/nvme/ioctl.h b/libnvme/src/nvme/ioctl.h
@@ -18,7 +18,6 @@
 #include <sys/ioctl.h>
 
 #include <nvme/types.h>
-#include <nvme/api-types.h>
 
 /*
  * We can not always count on the kernel UAPI being installed. Use the same
diff --git a/libnvme/src/nvme/mi.h b/libnvme/src/nvme/mi.h
@@ -89,7 +89,6 @@
 
 #include <nvme/types.h>
 #include <nvme/tree.h>
-#include <nvme/api-types.h>
 
 /**
  * NVME_MI_MSGTYPE_NVME - MCTP message type for NVMe-MI messages.
diff --git a/libnvme/src/nvme/tree.h b/libnvme/src/nvme/tree.h
@@ -18,7 +18,6 @@
 
 #include <nvme/ioctl.h>
 #include <nvme/util.h>
-#include <nvme/api-types.h>
 
 /**
  * DOC: tree.h
diff --git a/libnvme/src/nvme/types.h b/libnvme/src/nvme/types.h
@@ -12,9 +12,30 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #include <linux/types.h>
 
+struct nvme_global_ctx;
+struct nvme_transport_handle;
+
+/**
+ * nvme_create_global_ctx() - Initialize global context object
+ * @fp:		File descriptor for logging messages
+ * @log_level:	Logging level to use
+ *
+ * Return: Initialized &struct nvme_global_ctx object
+ */
+struct nvme_global_ctx *nvme_create_global_ctx(FILE *fp, int log_level);
+
+/**
+ * nvme_free_global_ctx() - Free global context object
+ * @ctx:	&struct nvme_global_ctx object
+ *
+ * Free an &struct nvme_global_ctx object and all attached objects
+ */
+void nvme_free_global_ctx(struct nvme_global_ctx *ctx);
+
 /**
  * DOC: types.h
  *
diff --git a/libnvme/test/ioctl/ana.c b/libnvme/test/ioctl/ana.c
@@ -11,7 +11,6 @@
 #include <libnvme.h>
 
 #include "mock.h"
-#include "nvme/api-types.h"
 #include "util.h"
 
 #define TEST_FD 0xFD
diff --git a/libnvme/test/ioctl/misc.c b/libnvme/test/ioctl/misc.c
@@ -4,7 +4,6 @@
 
 #include "mock.h"
 #include "util.h"
-#include <nvme/api-types.h>
 #include <nvme/ioctl.h>
 #include <nvme/types.h>
 #include <string.h>
diff --git a/libnvme/test/ioctl/zns.c b/libnvme/test/ioctl/zns.c
@@ -4,7 +4,6 @@
 
 #include "mock.h"
 #include "util.h"
-#include <nvme/api-types.h>
 #include <nvme/ioctl.h>
 #include <nvme/types.h>
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`#`
`10`	`10`
`11`	`11`	`api_files = [`
`12`		`- 'api-types.h',`
`13`	`12`	`'fabrics.h',`
`14`	`13`	`'filters.h',`
`15`	`14`	`'ioctl.h',`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ install_headers([`
`94`	`94`	`install_mode: mode,`
`95`	`95`	`)`
`96`	`96`	`install_headers([`
`97`		`- 'nvme/api-types.h',`
`98`	`97`	`'nvme/fabrics.h',`
`99`	`98`	`'nvme/filters.h',`
`100`	`99`	`'nvme/ioctl.h',`