blktap: remove unused headers.

Attached patch removes unused linux specific headers
and makes bswap.h ready for BSD support.

This is first step for BSD support in blktap. More to come.
No functional change.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c
index 7045880668f80d50a5972d23d5ad50ff0c4360b1..8e630aeeee1c4828c56f060c795f6cbfb61ba65a 100644 (file)
--- a/tools/blktap/drivers/blktapctrl.c
+++ b/tools/blktap/drivers/blktapctrl.c
@@ -41,7 +41,6 @@
 #include <err.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <linux/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -50,7 +49,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <xs.h>
-#include <printf.h>
 #include <sys/time.h>
 #include <syslog.h>
                                                                      

diff --git a/tools/blktap/drivers/bswap.h b/tools/blktap/drivers/bswap.h
index bb9de92b25c0189af6fda4d04bb947fe2d6096e8..51251505d32e8623da90547131c01da80abbd217 100644 (file)
--- a/tools/blktap/drivers/bswap.h
+++ b/tools/blktap/drivers/bswap.h
@@ -5,6 +5,11 @@
 
 #include <inttypes.h>
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/endian.h>
+#include <sys/types.h>
+#else
+
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #else
@@ -73,6 +78,8 @@ static inline void bswap64s(uint64_t *s)
     *s = bswap64(*s);
 }
 
+#endif
+
 #if defined(WORDS_BIGENDIAN)
 #define be_bswap(v, size) (v)
 #define le_bswap(v, size) bswap ## size(v)

diff --git a/tools/blktap/drivers/qcow-create.c b/tools/blktap/drivers/qcow-create.c
index 79492f1bf537fb8a1bb66b4309fc432fca8983e4..eaec6dfcc2ddb11910617a70aabc4c6795848d5e 100644 (file)
--- a/tools/blktap/drivers/qcow-create.c
+++ b/tools/blktap/drivers/qcow-create.c
@@ -37,7 +37,6 @@
 #include <sys/statvfs.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
 #include <string.h>
 #include "tapdisk.h"
 

diff --git a/tools/blktap/drivers/tapdisk.c b/tools/blktap/drivers/tapdisk.c
index ae1d7d6ccdd65d8590b6cb4f472fdafb510ce691..993e09b155b06d792c8fe071c6fd85057f9486bf 100644 (file)
--- a/tools/blktap/drivers/tapdisk.c
+++ b/tools/blktap/drivers/tapdisk.c
@@ -27,7 +27,6 @@
 #include <poll.h>
 #include <sys/statvfs.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
 #include "blktaplib.h"
 #include "tapdisk.h"
 

diff --git a/tools/blktap/lib/xenbus.c b/tools/blktap/lib/xenbus.c
index 53a3338f1e9ce27e105bb00a76040fcddc054b81..cf6b8416184ad9f06046128c145e219c8e8880e3 100644 (file)
--- a/tools/blktap/lib/xenbus.c
+++ b/tools/blktap/lib/xenbus.c
@@ -37,7 +37,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <printf.h>
 #include <string.h>
 #include <err.h>
 #include <stdarg.h>

diff --git a/tools/blktap/lib/xs_api.c b/tools/blktap/lib/xs_api.c
index 783b4ce3b35e41887720a8bcd2fcaeae5154d116..41bbd47bb23bf11aed1ae6d045681c9eb73a8973 100644 (file)
--- a/tools/blktap/lib/xs_api.c
+++ b/tools/blktap/lib/xs_api.c
@@ -34,7 +34,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <printf.h>
 #include <string.h>
 #include <err.h>
 #include <stdarg.h>