diff options
| author | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2005-10-27 10:53:02 +0100 |
|---|---|---|
| committer | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2005-10-27 10:53:02 +0100 |
| commit | f76bd5cf5e9e56b46c8c5acb595dbec6b842c34d (patch) | |
| tree | 282deecb83255962206f9a7f98c917f9208f5f02 /tools/xenstat/xentop | |
| parent | 740401a4f848c64541f892b224d32aec56ac6946 (diff) | |
| download | xen-f76bd5cf5e9e56b46c8c5acb595dbec6b842c34d.tar.gz xen-f76bd5cf5e9e56b46c8c5acb595dbec6b842c34d.tar.bz2 xen-f76bd5cf5e9e56b46c8c5acb595dbec6b842c34d.zip | |
Fix Jerone Young's xenstat / xenstore patch:
Reject the removal of -Werror from the xentop Makefile.
Reject the #include of xs.h inside xentop -- there is no need for it.
Have XendDomainInfo write domain names into /local/domain (which used to happen,
but hasn't for a little while).
Remove the dead code from xentop.c.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools/xenstat/xentop')
| -rw-r--r-- | tools/xenstat/xentop/Makefile | 2 | ||||
| -rw-r--r-- | tools/xenstat/xentop/xentop.c | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 2115e6f3cf..633fd57064 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -26,7 +26,7 @@ mandir=$(prefix)/share/man man1dir=$(mandir)/man1 sbindir=$(prefix)/sbin -CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT) +CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) LDFLAGS += -L$(XEN_LIBXENSTAT) LDLIBS += -lxenstat -lncurses diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index 286b037051..050f95bfcb 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -28,7 +28,6 @@ #include <time.h> #include <unistd.h> -#include <xs.h> #include <xenstat.h> #define XENTOP_VERSION "1.0" @@ -68,8 +67,6 @@ static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); /* Field functions */ -static int compare_domid(xenstat_domain *domain1, xenstat_domain *domain2); -static void print_domid(xenstat_domain *domain); static int compare_state(xenstat_domain *domain1, xenstat_domain *domain2); static void print_state(xenstat_domain *domain); static int compare_cpu(xenstat_domain *domain1, xenstat_domain *domain2); @@ -131,7 +128,6 @@ typedef struct field { } field; field fields[] = { -// { FIELD_DOMID, "DOMID", 5, compare_domid, print_domid }, { FIELD_NAME, "NAME", 10, compare_name, print_name }, { FIELD_STATE, "STATE", 6, compare_state, print_state }, { FIELD_CPU, "CPU(sec)", 10, compare_cpu, print_cpu }, @@ -349,18 +345,6 @@ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) /* Field functions */ -/* Compares domain ids of two domains, returning -1,0,1 for <,=,> */ -int compare_domid(xenstat_domain *domain1, xenstat_domain *domain2) -{ - return compare(xenstat_domain_id(domain1), xenstat_domain_id(domain2)); -} - -/* Prints domain identification number */ -void print_domid(xenstat_domain *domain) -{ - print("%5u", xenstat_domain_id(domain)); -} - /* Compare domain names, returning -1,0,1 for <,=,> */ int compare_name(xenstat_domain *domain1, xenstat_domain *domain2) { |