[Xen-changelog] [xen-unstable] blktap: remove unused headers.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196765308 0
# Node ID b1da8762f85312656b19a905903ddf06fe0bacf2
# Parent  9ce9d43a76a2b4c65daa7f328fd5a4c869686695
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@xxxxxxx>
---
 tools/blktap/drivers/blktapctrl.c  |    2 --
 tools/blktap/drivers/bswap.h       |    7 +++++++
 tools/blktap/drivers/qcow-create.c |    1 -
 tools/blktap/drivers/tapdisk.c     |    1 -
 tools/blktap/lib/xenbus.c          |    1 -
 tools/blktap/lib/xs_api.c          |    1 -
 6 files changed, 7 insertions(+), 6 deletions(-)

diff -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/drivers/blktapctrl.c Tue Dec 04 10:48:28 2007 +0000
@@ -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 -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/drivers/bswap.h
--- a/tools/blktap/drivers/bswap.h      Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/drivers/bswap.h      Tue Dec 04 10:48:28 2007 +0000
@@ -4,6 +4,11 @@
 //#include "config-host.h"
 
 #include <inttypes.h>
+
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/endian.h>
+#include <sys/types.h>
+#else
 
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
@@ -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 -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/drivers/qcow-create.c
--- a/tools/blktap/drivers/qcow-create.c        Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/drivers/qcow-create.c        Tue Dec 04 10:48:28 2007 +0000
@@ -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 -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/drivers/tapdisk.c
--- a/tools/blktap/drivers/tapdisk.c    Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/drivers/tapdisk.c    Tue Dec 04 10:48:28 2007 +0000
@@ -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 -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/lib/xenbus.c
--- a/tools/blktap/lib/xenbus.c Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/lib/xenbus.c Tue Dec 04 10:48:28 2007 +0000
@@ -37,7 +37,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <printf.h>
 #include <string.h>
 #include <err.h>
 #include <stdarg.h>
diff -r 9ce9d43a76a2 -r b1da8762f853 tools/blktap/lib/xs_api.c
--- a/tools/blktap/lib/xs_api.c Tue Dec 04 10:47:10 2007 +0000
+++ b/tools/blktap/lib/xs_api.c Tue Dec 04 10:48:28 2007 +0000
@@ -34,7 +34,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <printf.h>
 #include <string.h>
 #include <err.h>
 #include <stdarg.h>

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog