From d1729249ef61b781bcb18006d0c34fcd772e46bb Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 24 Sep 2007 15:38:52 +0100 Subject: xenstat/xenstore: NetBSD fixes. Signed-off-by: Christoph Egger --- tools/xenstat/libxenstat/Makefile | 1 + tools/xenstat/xentop/xentop.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'tools/xenstat') diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index ed359a6ded..69cbf2fca7 100644 --- 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 92d4eb217a..755e322f56 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -28,7 +28,9 @@ #include #include #include +#if defined(__linux__) #include +#endif #include @@ -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", -- cgit v1.2.3