ia64/xen-unstable

changeset 15971:a6190cf22c46

xenstat/xenstore: NetBSD fixes.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
author Keir Fraser <keir@xensource.com>
date Mon Sep 24 15:38:52 2007 +0100 (2007-09-24)
parents 94e3684d0e81
children f673460e0701
files tools/xenstat/libxenstat/Makefile tools/xenstat/xentop/xentop.c tools/xenstore/Makefile
line diff
     1.1 --- a/tools/xenstat/libxenstat/Makefile	Mon Sep 24 15:29:09 2007 +0100
     1.2 +++ b/tools/xenstat/libxenstat/Makefile	Mon Sep 24 15:38:52 2007 +0100
     1.3 @@ -31,6 +31,7 @@ SHLIB_LINKS=src/libxenstat.so.$(MAJOR) s
     1.4  OBJECTS-y=src/xenstat.o
     1.5  OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
     1.6  OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
     1.7 +OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
     1.8  SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
     1.9  
    1.10  WARN_FLAGS=-Wall -Werror
     2.1 --- a/tools/xenstat/xentop/xentop.c	Mon Sep 24 15:29:09 2007 +0100
     2.2 +++ b/tools/xenstat/xentop/xentop.c	Mon Sep 24 15:38:52 2007 +0100
     2.3 @@ -28,7 +28,9 @@
     2.4  #include <sys/time.h>
     2.5  #include <time.h>
     2.6  #include <unistd.h>
     2.7 +#if defined(__linux__)
     2.8  #include <linux/kdev_t.h>
     2.9 +#endif
    2.10  
    2.11  #include <xenstat.h>
    2.12  
    2.13 @@ -938,11 +940,12 @@ void do_vbd(xenstat_domain *domain)
    2.14  
    2.15  		vbd = xenstat_domain_vbd(domain,i);
    2.16  
    2.17 -#ifdef __sun__
    2.18 +#if !defined(__linux__)
    2.19  		details[0] = '\0';
    2.20  #else
    2.21 -		snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)),
    2.22 -		         MINOR(xenstat_vbd_dev(vbd)));
    2.23 +		snprintf(details, 20, "[%2x:%2x] ",
    2.24 +			 MAJOR(xenstat_vbd_dev(vbd)),
    2.25 +			 MINOR(xenstat_vbd_dev(vbd)));
    2.26  #endif
    2.27  
    2.28  		print("VBD %s %4d %s OO: %8llu   RD: %8llu   WR: %8llu\n",
     3.1 --- a/tools/xenstore/Makefile	Mon Sep 24 15:29:09 2007 +0100
     3.2 +++ b/tools/xenstore/Makefile	Mon Sep 24 15:38:52 2007 +0100
     3.3 @@ -25,6 +25,7 @@ XENSTORED_OBJS = xenstored_core.o xensto
     3.4  
     3.5  XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_linux.o
     3.6  XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o
     3.7 +XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_netbsd.o
     3.8  
     3.9  XENSTORED_OBJS += $(XENSTORED_OBJS_y)
    3.10