# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID e70ea9465b310e1cba9678ac4e9ad534bb8b670a
# Parent a793b7a53605c8e21901ea9d6c68e085247eb8b7
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@xxxxxxxxxxxxx>
diff -r a793b7a53605 -r e70ea9465b31 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Thu Oct 27 09:19:58 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py Thu Oct 27 09:53:02 2005
@@ -595,6 +595,7 @@
to_store = {
'domid': str(self.domid),
'vm': self.vmpath,
+ 'name': self.info['name'],
'console/limit': str(xroot.get_console_limit() * 1024),
'memory/target': str(self.info['memory_KiB'])
}
diff -r a793b7a53605 -r e70ea9465b31 tools/xenstat/xentop/Makefile
--- a/tools/xenstat/xentop/Makefile Thu Oct 27 09:19:58 2005
+++ b/tools/xenstat/xentop/Makefile Thu Oct 27 09:53:02 2005
@@ -26,7 +26,7 @@
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 -r a793b7a53605 -r e70ea9465b31 tools/xenstat/xentop/xentop.c
--- a/tools/xenstat/xentop/xentop.c Thu Oct 27 09:19:58 2005
+++ b/tools/xenstat/xentop/xentop.c Thu Oct 27 09:53:02 2005
@@ -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 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 @@
} 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 @@
/* 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)
{
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home