xenstat/xenstore: NetBSD fixes.

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

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index ed359a6ded95fe5c018bb5bc04d963757f4f5d1c..69cbf2fca7aa73863d79a10261845df89bff5c69 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -31,6 +31,7 @@ SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
 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 --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 92d4eb217a41b0032ff387abbfaee8693bebdadf..755e322f56e578ec12be3ca9ff9ec8214126eeb9 100644 (file)
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -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 --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index a754fab85f9c0a2b7ff5a5ca513ac4fb308c2ea3..adbe6056752d77de06158d24da84f891cdfc10ed 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -25,6 +25,7 @@ XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored
 
 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)