types: provide base types when missing

igaw · igaw · commit 9f302b4ef148 · 2026-04-15T09:10:27.000+02:00
Not all platforms define the base types used throughout the library.
Inthat case, define them.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/fabrics.c b/fabrics.c
@@ -33,8 +33,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <linux/types.h>
-
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/libnvme/src/libnvme.h.in b/libnvme/src/libnvme.h.in
@@ -23,6 +23,7 @@ extern "C" {
 #include <nvme/nvme-cmds.h>
 #include <nvme/nvme-types.h>
 #include <nvme/tree.h>
+#include <nvme/types.h>
 #include <nvme/util.h>
 @FABRICS_INCLUDE@
 
diff --git a/libnvme/src/meson.build b/libnvme/src/meson.build
@@ -35,6 +35,7 @@ headers = [
     'nvme/nvme-cmds.h',
     'nvme/nvme-types.h',
     'nvme/tree.h',
+    'nvme/types.h',
     'nvme/util.h',
 ]
 
diff --git a/libnvme/src/nvme/accessors-fabrics.h b/libnvme/src/nvme/accessors-fabrics.h
@@ -24,7 +24,8 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <linux/types.h> /* __u32, __u64, etc. */
+
+#include <nvme/types.h>
 
 /* Forward declarations. These are internal (opaque) structs. */
 struct libnvmf_discovery_args;
diff --git a/libnvme/src/nvme/accessors.h b/libnvme/src/nvme/accessors.h
@@ -24,7 +24,8 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <linux/types.h> /* __u32, __u64, etc. */
+
+#include <nvme/types.h>
 
 /* Forward declarations. These are internal (opaque) structs. */
 struct libnvme_path;
diff --git a/libnvme/src/nvme/lib-types.h b/libnvme/src/nvme/lib-types.h
@@ -8,7 +8,7 @@
  */
 #pragma once
 
-#include <linux/types.h>
+#include <nvme/types.h>
 
 struct libnvme_global_ctx;
 struct libnvme_transport_handle;
diff --git a/libnvme/src/nvme/mi-mctp-compat.h b/libnvme/src/nvme/mi-mctp-compat.h
@@ -3,7 +3,7 @@
 #ifndef _MI_MCTP_COMPAT_H
 #define _MI_MCTP_COMPAT_H
 
-#include <linux/types.h>
+#include <nvme/types.h>
 
 /* As of kernel v5.15, these AF_MCTP-related definitions are provided by
  * linux/mctp.h. However, we provide a set here while that header percolates
diff --git a/libnvme/src/nvme/nbft.h b/libnvme/src/nvme/nbft.h
@@ -10,7 +10,6 @@
 
 #include <stdbool.h>
 
-#include <linux/types.h>
 #include <sys/types.h>
 
 #include <nvme/lib-types.h>
diff --git a/libnvme/src/nvme/nvme-types.h b/libnvme/src/nvme/nvme-types.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <linux/types.h>
+#include <nvme/types.h>
 
 /**
  * DOC: types.h
diff --git a/libnvme/src/nvme/private-fabrics.h b/libnvme/src/nvme/private-fabrics.h
@@ -7,8 +7,6 @@
  */
 #pragma once
 
-#include <linux/types.h>
-
 #include <nvme/tree.h>
 
 /**
diff --git a/libnvme/src/nvme/types.h b/libnvme/src/nvme/types.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2026 SUSE Software Solutions
+ *
+ * Authors: Daniel Wagner <dwagner@suse.de>
+ */
+
+#pragma once
+
+#if defined(__linux__)
+#include <linux/types.h>
+#else
+#include <stdint.h>
+
+/* Standard type definitions for linux/types.h compatibility */
+typedef uint8_t  __u8;
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+typedef uint64_t __u64;
+typedef int8_t   __s8;
+typedef int16_t  __s16;
+typedef int32_t  __s32;
+typedef int64_t  __s64;
+
+/* Little-endian types (Windows is little-endian) */
+typedef __u16    __le16;
+typedef __u32    __le32;
+typedef __u64    __le64;
+typedef __s16    __le16s;
+typedef __s32    __le32s;
+typedef __s64    __le64s;
+
+/* Big-endian types for completeness */
+typedef __u16    __be16;
+typedef __u32    __be32;
+typedef __u64    __be64;
+typedef __s16    __be16s;
+typedef __s32    __be32s;
+typedef __s64    __be64s;
+#endif
diff --git a/libnvme/tools/generator/generate-accessors.md b/libnvme/tools/generator/generate-accessors.md
@@ -124,7 +124,8 @@ python3 generate-accessors.py person.h
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <linux/types.h> /* __u32, __u64, etc. */
+
+#include <nvme/types.h>
 
 /* Forward declarations. These are internal (opaque) structs. */
 struct person;
diff --git a/libnvme/tools/generator/generate-accessors.py b/libnvme/tools/generator/generate-accessors.py
@@ -630,8 +630,8 @@ def main():
             f'#include <stdlib.h>\n'
             f'#include <string.h>\n'
             f'#include <stdbool.h>\n'
-            f'#include <stdint.h>\n'
-            f'#include <linux/types.h> /* __u32, __u64, etc. */\n'
+            f'#include <stdint.h>\n\n'
+            f'#include <nvme/types.h>\n'
             f'\n'
         )
         f.write('/* Forward declarations. These are internal (opaque) structs. */\n')
diff --git a/logging.c b/logging.c
@@ -6,8 +6,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <linux/types.h>
-
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
@@ -10,7 +10,6 @@
 #include <libnvme.h>
 
 #include "common.h"
-#include "linux/types.h"
 #include "nvme-cmds.h"
 #include "nvme-print.h"
 #include "nvme.h"
diff --git a/plugins/ocp/ocp-fw-activation-history.h b/plugins/ocp/ocp-fw-activation-history.h
@@ -7,7 +7,6 @@
 #include <libnvme.h>
 
 #include "common.h"
-#include "linux/types.h"
 
 #ifndef OCP_FIRMWARE_ACTIVATION_HISTORY_H
 #define OCP_FIRMWARE_ACTIVATION_HISTORY_H
diff --git a/plugins/ocp/ocp-smart-extended-log.h b/plugins/ocp/ocp-smart-extended-log.h
@@ -6,8 +6,9 @@
  *          Venkat Ramesh <venkatraghavan@fb.com>
  */
 
+#include <nvme/types.h>
+
 #include "common.h"
-#include "linux/types.h"
 
 #ifndef OCP_SMART_EXTENDED_LOG_H
 #define OCP_SMART_EXTENDED_LOG_H
diff --git a/plugins/ocp/ocp-telemetry-decode.c b/plugins/ocp/ocp-telemetry-decode.c
@@ -8,7 +8,6 @@
 #include "common.h"
 #include "nvme.h"
 #include "plugin.h"
-#include "linux/types.h"
 #include "util/types.h"
 #include "nvme-print.h"
 
diff --git a/plugins/solidigm/solidigm-garbage-collection.c b/plugins/solidigm/solidigm-garbage-collection.c
@@ -17,7 +17,6 @@
 #include "common.h"
 #include "nvme.h"
 #include "plugin.h"
-#include "linux/types.h"
 #include "nvme-print.h"
 #include "solidigm-garbage-collection.h"
 #include "solidigm-util.h"
diff --git a/plugins/solidigm/solidigm-smart.c b/plugins/solidigm/solidigm-smart.c
@@ -16,7 +16,6 @@
 #include "common.h"
 #include "nvme.h"
 #include "plugin.h"
-#include "linux/types.h"
 #include "nvme-print.h"
 
 #include "solidigm-smart.h"
diff --git a/util/argconfig.h b/util/argconfig.h
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <linux/types.h>
+#include <nvme/types.h>
 
 enum argconfig_types {
 	CFG_FLAG,
diff --git a/util/types.h b/util/types.h
@@ -7,8 +7,6 @@
 #include <stdint.h>
 #include <time.h>
 
-#include <linux/types.h>
-
 #include <libnvme.h>
 
 #define ABSOLUTE_ZERO_CELSIUS -273

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ headers = [`
`35`	`35`	`'nvme/nvme-cmds.h',`
`36`	`36`	`'nvme/nvme-types.h',`
`37`	`37`	`'nvme/tree.h',`
	`38`	`+ 'nvme/types.h',`
`38`	`39`	`'nvme/util.h',`
`39`	`40`	`]`
`40`	`41`