libnvme: include main headers where possible

Unify the header includes. Use the libnvme.h or/and libnvme-mi.h
everywhere instead indiviual headers. This makes the refactoring of the
headers simpler (splitting them into smaller ones).

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

Author: igaw

libnvme/src/nvme/fabrics.c

@@ -33,15 +33,12 @@
 #include <ccan/array_size/array_size.h>
 #include <ccan/str/str.h>
 
+#include <libnvme.h>
+
 #include "cleanup.h"
-#include "fabrics.h"
-#include "linux.h"
-#include "ioctl.h"
-#include "nbft.h"
-#include "nvme/tree.h"
-#include "util.h"
 #include "log.h"
 #include "private.h"
+#include "util.h"
 
 #define NVMF_HOSTID_SIZE	37
 

libnvme/src/nvme/filters.c

@@ -10,7 +10,8 @@
 #include <string.h>
 #include <dirent.h>
 
-#include "filters.h"
+#include <libnvme.h>
+
 #include "private.h"
 
 int nvme_namespace_filter(const struct dirent *d)

libnvme/src/nvme/ioctl.c

@@ -26,7 +26,8 @@
 #include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
 
-#include "ioctl.h"
+#include <libnvme.h>
+
 #include "private.h"
 
 static int nvme_verify_chr(struct nvme_transport_handle *hdl)

libnvme/src/nvme/json.c

@@ -14,11 +14,10 @@
 
 #include <json.h>
 
+#include <libnvme.h>
+
 #include "cleanup.h"
-#include "fabrics.h"
-#include "log.h"
 #include "private.h"
-#include "linux.h"
 
 #define JSON_UPDATE_INT_OPTION(c, k, a, o)				\
 	if (!strcmp(# a, k ) && !c->a) c->a = json_object_get_int(o);

libnvme/src/nvme/linux.c

@@ -33,13 +33,12 @@
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
+#include "crc32.h"
+#include "base64.h"
 #include "cleanup.h"
-#include "linux.h"
-#include "tree.h"
-#include "log.h"
 #include "private.h"
-#include "base64.h"
-#include "crc32.h"
 
 void nvme_set_dry_run(struct nvme_global_ctx *ctx, bool enable)
 {

libnvme/src/nvme/log.c

@@ -15,10 +15,12 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <time.h>
+
+#include <libnvme.h>
+
+#include "cleanup.h"
 #define LOG_FUNCNAME 1
 #include "private.h"
-#include "log.h"
-#include "cleanup.h"
 
 #ifndef LOG_CLOCK
 #define LOG_CLOCK CLOCK_MONOTONIC

libnvme/src/nvme/mi-mctp.c

@@ -34,9 +34,10 @@
 #define MCTP_DBUS_IFACE_ENDPOINT "xyz.openbmc_project.MCTP.Endpoint"
 #endif
 
+#include <libnvme.h>
+#include <libnvme-mi.h>
+
 #include "private.h"
-#include "log.h"
-#include "mi.h"
 
 
 #if !defined(AF_MCTP)

libnvme/src/nvme/mi.c

@@ -17,9 +17,9 @@
 #include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
 
-#include "log.h"
-#include "mi.h"
-#include "linux.h"
+#include <libnvme.h>
+#include <libnvme-mi.h>
+
 #include "private.h"
 
 #define NUM_ENABLES    (256u)

libnvme/src/nvme/nbft.c

@@ -13,9 +13,9 @@
 #include <arpa/inet.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
 #include "private.h"
-#include "nbft.h"
-#include "log.h"
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 

libnvme/src/nvme/no-json.c

@@ -6,7 +6,7 @@
  * Authors: Daniel Wagner <[email protected]>
  */
 
-#include "tree.h"
+#include <libnvme.h>
 
 #include <errno.h>