# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1190644732 -3600
# Node ID a6190cf22c46f193808d0f2c961e84a3d595df52
# Parent 94e3684d0e8149c003cd7b0c74ef0055353fcede
xenstat/xenstore: NetBSD fixes.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
tools/xenstat/libxenstat/Makefile | 1 +
tools/xenstat/xentop/xentop.c | 9 ++++++---
tools/xenstore/Makefile | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff -r 94e3684d0e81 -r a6190cf22c46 tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Mon Sep 24 15:29:09 2007 +0100
+++ b/tools/xenstat/libxenstat/Makefile Mon Sep 24 15:38:52 2007 +0100
@@ -31,6 +31,7 @@ OBJECTS-y=src/xenstat.o
OBJECTS-y=src/xenstat.o
OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
+OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
WARN_FLAGS=-Wall -Werror
diff -r 94e3684d0e81 -r a6190cf22c46 tools/xenstat/xentop/xentop.c
--- a/tools/xenstat/xentop/xentop.c Mon Sep 24 15:29:09 2007 +0100
+++ b/tools/xenstat/xentop/xentop.c Mon Sep 24 15:38:52 2007 +0100
@@ -28,7 +28,9 @@
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
+#if defined(__linux__)
#include <linux/kdev_t.h>
+#endif
#include <xenstat.h>
@@ -938,11 +940,12 @@ void do_vbd(xenstat_domain *domain)
vbd = xenstat_domain_vbd(domain,i);
-#ifdef __sun__
+#if !defined(__linux__)
details[0] = '\0';
#else
- snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)),
- MINOR(xenstat_vbd_dev(vbd)));
+ snprintf(details, 20, "[%2x:%2x] ",
+ MAJOR(xenstat_vbd_dev(vbd)),
+ MINOR(xenstat_vbd_dev(vbd)));
#endif
print("VBD %s %4d %s OO: %8llu RD: %8llu WR: %8llu\n",
diff -r 94e3684d0e81 -r a6190cf22c46 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Mon Sep 24 15:29:09 2007 +0100
+++ b/tools/xenstore/Makefile Mon Sep 24 15:38:52 2007 +0100
@@ -25,6 +25,7 @@ XENSTORED_OBJS = xenstored_core.o xensto
XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_linux.o
XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o
+XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_netbsd.o
XENSTORED_OBJS += $(XENSTORED_OBJS_y)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home