[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 25dd49641a7486d8706640011b4be9baaf64079f
# Parent  bc398d47d08f9ec802ad7977ff6fe12295812d0a
# Parent  6b6e09240435e559a116ea26c569f82be58c68b9
Merged.

diff -r bc398d47d08f -r 25dd49641a74 tools/console/daemon/io.c
--- a/tools/console/daemon/io.c Wed Dec  7 11:43:43 2005
+++ b/tools/console/daemon/io.c Wed Dec  7 11:44:02 2005
@@ -486,7 +486,7 @@
        len = write(dom->tty_fd, dom->buffer.data + dom->buffer.consumed,
                    dom->buffer.size - dom->buffer.consumed);
        if (len < 1) {
-               dolog(LOG_DEBUG, "Write failed on domain %d: %d, %d\n",
+               dolog(LOG_DEBUG, "Write failed on domain %d: %zd, %d\n",
                      dom->domid, len, errno);
 
                close(dom->tty_fd);
diff -r bc398d47d08f -r 25dd49641a74 tools/examples/xen-hotplug-common.sh
--- a/tools/examples/xen-hotplug-common.sh      Wed Dec  7 11:43:43 2005
+++ b/tools/examples/xen-hotplug-common.sh      Wed Dec  7 11:44:02 2005
@@ -73,7 +73,7 @@
 # path is not present.
 #
 xenstore_read_default() {
-  xenstore-read "$1" || echo "$2"
+  xenstore-read "$1" 2>/dev/null || echo "$2"
 }
 
 
@@ -146,7 +146,7 @@
 _release_lock()
 {
   trap sigerr ERR
-  rm -rf "$1" || true
+  rm -rf "$1" 2>/dev/null || true
 }
 
 
diff -r bc398d47d08f -r 25dd49641a74 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Wed Dec  7 11:43:43 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Wed Dec  7 11:44:02 2005
@@ -1041,7 +1041,6 @@
             sxpr.append(['shutdown_reason', reason])
         if self.infoIsSet('cpu_time'):
             sxpr.append(['cpu_time', self.info['cpu_time']/1e9])
-        sxpr.append(['vcpus', self.info['vcpus']])
         sxpr.append(['online_vcpus', self.info['online_vcpus']])
             
         if self.infoIsSet('start_time'):

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog