libnvme: add nvme- prefix to types.h and cmds.h

Follow the naming pattern recently introduced and prefix the types and
cmds headers.

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

Author: igaw

libnvme/doc/meson.build

@@ -15,8 +15,9 @@ api_files = [
     'linux.h',
     'mi.h',
     'nbft.h',
+    'nvme-cmds.h',
+    'nvme-types.h',
     'tree.h',
-    'types.h',
     'util.h'
 ]
 

libnvme/libnvme/nvme.i

@@ -1238,12 +1238,12 @@ struct libnvme_ns {
 		    "@param filename: file to read") nbft_get;
 PyObject *nbft_get(struct libnvme_global_ctx *ctx, const char * filename);
 
-// We want to swig all the #define and enum from types.h, but none of the structs.
+// We want to swig all the #define and enum from nvme-types.h, but none of the structs.
 #pragma SWIG nowarn=503             // Supress warnings about unnamed struct
 #define __attribute__(x)
 %rename($ignore, %$isclass) "";     // ignore all classes/structs
 %rename($ignore, %$isfunction) "";  // ignore all functions
 %rename($ignore, %$isunion) "";     // ignore all unions
 %rename($ignore, %$isvariable) "";  // ignore all variables
 
-%include "../src/nvme/types.h"
+%include "../src/nvme/nvme-types.h"

libnvme/src/libnvme-mi.h

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

libnvme/src/libnvme.h.in

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

libnvme/src/meson.build

@@ -12,28 +12,28 @@ else
     sources += [
         'nvme/accessors.c',
         'nvme/base64.c',
-        'nvme/cmds.c',
         'nvme/crc32.c',
         'nvme/filters.c',
         'nvme/ioctl.c',
         'nvme/lib.c',
         'nvme/linux.c',
         'nvme/log.c',
+        'nvme/nvme-cmds.c',
         'nvme/sysfs.c',
         'nvme/tree.c',
         'nvme/util.c',
     ]
 endif
 headers = [
     'nvme/accessors.h',
-    'nvme/cmds.h',
     'nvme/filters.h',
     'nvme/ioctl.h',
     'nvme/lib-types.h',
     'nvme/lib.h',
     'nvme/linux.h',
+    'nvme/nvme-cmds.h',
+    'nvme/nvme-types.h',
     'nvme/tree.h',
-    'nvme/types.h',
     'nvme/util.h',
 ]
 

libnvme/src/nvme/mi-types.h

@@ -10,7 +10,7 @@
 #include <endian.h>
 #include <stdint.h>
 
-#include <nvme/types.h>
+#include <nvme/nvme-types.h>
 
 /**
  * NVME_MI_MSGTYPE_NVME - MCTP message type for NVMe-MI messages.

libnvme/src/nvme/cmds.c libnvme/src/nvme/nvme-cmds.clibnvme/src/nvme/cmds.c renamed to libnvme/src/nvme/nvme-cmds.c

@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include <nvme/ioctl.h>
-#include <nvme/types.h>
+#include <nvme/nvme-types.h>
 
 enum nvme_cmd_dword_fields {
 	NVME_DEVICE_SELF_TEST_CDW10_STC_SHIFT			= 0,

libnvme/src/nvme/cmds.h libnvme/src/nvme/nvme-cmds.hlibnvme/src/nvme/cmds.h renamed to libnvme/src/nvme/nvme-cmds.h

@@ -12,7 +12,7 @@
 #include <stddef.h>
 
 #include <nvme/lib-types.h>
-#include <nvme/types.h>
+#include <nvme/nvme-types.h>
 
 /**
  * DOC: tree.h