ia64/xen-unstable

changeset 7534:e70ea9465b31

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>
author emellor@leeni.uk.xensource.com
date Thu Oct 27 10:53:02 2005 +0100 (2005-10-27)
parents a793b7a53605
children 76392609363f f994ee35da23
files tools/python/xen/xend/XendDomainInfo.py tools/xenstat/xentop/Makefile tools/xenstat/xentop/xentop.c
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 27 10:19:58 2005 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 27 10:53:02 2005 +0100
     1.3 @@ -595,6 +595,7 @@ class XendDomainInfo:
     1.4          to_store = {
     1.5              'domid':              str(self.domid),
     1.6              'vm':                 self.vmpath,
     1.7 +            'name':               self.info['name'],
     1.8              'console/limit':      str(xroot.get_console_limit() * 1024),
     1.9              'memory/target':      str(self.info['memory_KiB'])
    1.10              }
     2.1 --- a/tools/xenstat/xentop/Makefile	Thu Oct 27 10:19:58 2005 +0100
     2.2 +++ b/tools/xenstat/xentop/Makefile	Thu Oct 27 10:53:02 2005 +0100
     2.3 @@ -26,7 +26,7 @@ mandir=$(prefix)/share/man
     2.4  man1dir=$(mandir)/man1
     2.5  sbindir=$(prefix)/sbin
     2.6  
     2.7 -CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
     2.8 +CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
     2.9  LDFLAGS += -L$(XEN_LIBXENSTAT)
    2.10  LDLIBS += -lxenstat -lncurses
    2.11  
     3.1 --- a/tools/xenstat/xentop/xentop.c	Thu Oct 27 10:19:58 2005 +0100
     3.2 +++ b/tools/xenstat/xentop/xentop.c	Thu Oct 27 10:53:02 2005 +0100
     3.3 @@ -28,7 +28,6 @@
     3.4  #include <time.h>
     3.5  #include <unistd.h>
     3.6  
     3.7 -#include <xs.h>
     3.8  #include <xenstat.h>
     3.9  
    3.10  #define XENTOP_VERSION "1.0"
    3.11 @@ -68,8 +67,6 @@ static int compare_domains(xenstat_domai
    3.12  static unsigned long long tot_net_bytes( xenstat_domain *, int);
    3.13  
    3.14  /* Field functions */
    3.15 -static int compare_domid(xenstat_domain *domain1, xenstat_domain *domain2);
    3.16 -static void print_domid(xenstat_domain *domain);
    3.17  static int compare_state(xenstat_domain *domain1, xenstat_domain *domain2);
    3.18  static void print_state(xenstat_domain *domain);
    3.19  static int compare_cpu(xenstat_domain *domain1, xenstat_domain *domain2);
    3.20 @@ -131,7 +128,6 @@ typedef struct field {
    3.21  } field;
    3.22  
    3.23  field fields[] = {
    3.24 -//	{ FIELD_DOMID,   "DOMID",      5, compare_domid,   print_domid   },
    3.25  	{ FIELD_NAME,    "NAME",      10, compare_name,    print_name    },
    3.26  	{ FIELD_STATE,   "STATE",      6, compare_state,   print_state   },
    3.27  	{ FIELD_CPU,     "CPU(sec)",  10, compare_cpu,     print_cpu     },
    3.28 @@ -349,18 +345,6 @@ static int compare_domains(xenstat_domai
    3.29  
    3.30  /* Field functions */
    3.31  
    3.32 -/* Compares domain ids of two domains, returning -1,0,1 for <,=,> */
    3.33 -int compare_domid(xenstat_domain *domain1, xenstat_domain *domain2)
    3.34 -{
    3.35 -	return compare(xenstat_domain_id(domain1), xenstat_domain_id(domain2));
    3.36 -}
    3.37 -
    3.38 -/* Prints domain identification number */
    3.39 -void print_domid(xenstat_domain *domain)
    3.40 -{
    3.41 -	print("%5u", xenstat_domain_id(domain));
    3.42 -}
    3.43 -
    3.44  /* Compare domain names, returning -1,0,1 for <,=,> */
    3.45  int compare_name(xenstat_domain *domain1, xenstat_domain *domain2)
    3.46  {