aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-12-05 09:59:23 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-12-05 09:59:23 +0000
commit363a64884681a902b1c9303a7254a74fbbdd9936 (patch)
tree5548cd85442ae24852afa7de0b4d21cf95ce8270 /tools/blktap
parent45be668f9f824725ea8258d581f14533be28ce11 (diff)
downloadxen-363a64884681a902b1c9303a7254a74fbbdd9936.tar.gz
xen-363a64884681a902b1c9303a7254a74fbbdd9936.tar.bz2
xen-363a64884681a902b1c9303a7254a74fbbdd9936.zip
blktap: cleanups for *BSD.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'tools/blktap')
-rw-r--r--tools/blktap/drivers/blktapctrl.c4
-rw-r--r--tools/blktap/drivers/bswap.h7
-rw-r--r--tools/blktap/lib/blktaplib.h1
-rw-r--r--tools/blktap/lib/list.h4
-rw-r--r--tools/blktap/lib/xs_api.c6
5 files changed, 16 insertions, 6 deletions
diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c
index 8e630aeeee..b3f59ec58b 100644
--- a/tools/blktap/drivers/blktapctrl.c
+++ b/tools/blktap/drivers/blktapctrl.c
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
-#include <sys/user.h>
+#include <sys/stat.h>
#include <err.h>
#include <errno.h>
#include <sys/types.h>
@@ -684,7 +684,7 @@ static void write_pidfile(long pid)
exit(1);
}
- len = sprintf(buf, "%ld\n", pid);
+ len = snprintf(buf, sizeof(buf), "%ld\n", pid);
if (write(fd, buf, len) != len) {
DPRINTF("Writing pid file failed (%d)\n", errno);
exit(1);
diff --git a/tools/blktap/drivers/bswap.h b/tools/blktap/drivers/bswap.h
index 51251505d3..45016b978b 100644
--- a/tools/blktap/drivers/bswap.h
+++ b/tools/blktap/drivers/bswap.h
@@ -5,9 +5,14 @@
#include <inttypes.h>
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__)
#include <sys/endian.h>
#include <sys/types.h>
+#elif defined(__OpenBSD__)
+#include <machine/endian.h>
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
#else
#ifdef HAVE_BYTESWAP_H
diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index 9d17c6152e..d31a7fac92 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -33,6 +33,7 @@
#define __BLKTAPLIB_H__
#include <xenctrl.h>
+#include <sys/param.h>
#include <sys/user.h>
#include <xen/xen.h>
#include <xen/io/blkif.h>
diff --git a/tools/blktap/lib/list.h b/tools/blktap/lib/list.h
index bda5f46a38..c82242f56f 100644
--- a/tools/blktap/lib/list.h
+++ b/tools/blktap/lib/list.h
@@ -8,6 +8,10 @@
#ifndef __LIST_H__
#define __LIST_H__
+#ifdef LIST_HEAD
+#undef LIST_HEAD
+#endif
+
#define LIST_POISON1 ((void *) 0x00100100)
#define LIST_POISON2 ((void *) 0x00200200)
diff --git a/tools/blktap/lib/xs_api.c b/tools/blktap/lib/xs_api.c
index 41bbd47bb2..370a44aa4d 100644
--- a/tools/blktap/lib/xs_api.c
+++ b/tools/blktap/lib/xs_api.c
@@ -282,7 +282,7 @@ int register_xenbus_watch(struct xs_handle *h, struct xenbus_watch *watch)
/* Pointer in ascii is the token. */
char token[sizeof(watch) * 2 + 1];
- sprintf(token, "%lX", (long)watch);
+ snprintf(token, sizeof(token), "%lX", (long)watch);
if (find_watch(token)) {
DPRINTF("watch collision!\n");
return -EINVAL;
@@ -302,7 +302,7 @@ int unregister_xenbus_watch(struct xs_handle *h, struct xenbus_watch *watch)
{
char token[sizeof(watch) * 2 + 1];
- sprintf(token, "%lX", (long)watch);
+ snprintf(token, sizeof(token), "%lX", (long)watch);
if (!find_watch(token)) {
DPRINTF("no such watch!\n");
return -EINVAL;
@@ -326,7 +326,7 @@ void reregister_xenbus_watches(struct xs_handle *h)
char token[sizeof(watch) * 2 + 1];
list_for_each_entry(watch, &watches, list) {
- sprintf(token, "%lX", (long)watch);
+ snprintf(token, sizeof(token), "%lX", (long)watch);
xs_watch(h, watch->node, token);
}
}