[Xen-changelog] merge

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c43d7806ca5afc5f7ccfb51e4793192e6f2134bc
# Parent  a4071af0a463b762f1c7c7f314cf93afc0b18146
# Parent  c745e47d8154e2f77ceaa35e099c1163cda47cfc
merge

diff -r a4071af0a463 -r c43d7806ca5a tools/python/xen/util/xmlrpclib2.py
--- a/tools/python/xen/util/xmlrpclib2.py       Tue Mar 28 12:42:28 2006
+++ b/tools/python/xen/util/xmlrpclib2.py       Tue Mar 28 12:43:22 2006
@@ -24,6 +24,7 @@
 from xmlrpclib import Transport
 from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
 import xmlrpclib, socket, os, traceback
+import SocketServer
 
 # A new ServerProxy that also supports httpu urls.  An http URL comes in the
 # form:
@@ -62,7 +63,7 @@
 # true, and has an improved marshaller that serializes unknown exceptions
 # with full traceback information.
 
-class TCPXMLRPCServer(SimpleXMLRPCServer):
+class TCPXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer):
     allow_reuse_address = True
 
     def _marshaled_dispatch(self, data, dispatch_method = None):
diff -r a4071af0a463 -r c43d7806ca5a tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Tue Mar 28 12:42:28 2006
+++ b/tools/python/xen/xend/XendDomain.py       Tue Mar 28 12:43:22 2006
@@ -81,7 +81,8 @@
             # that we're sure that we haven't missed any releases, but inside
             # the domains_lock, as we don't want the watch to fire until after
             # the refresh call has completed.
-            xswatch("@releaseDomain", self.onReleaseDomain)
+            xswatch("@introduceDomain", self.onChangeDomain)
+            xswatch("@releaseDomain",   self.onChangeDomain)
             
             self.refresh(True)
         finally:
@@ -121,7 +122,7 @@
 
     ## private:
 
-    def onReleaseDomain(self, _):
+    def onChangeDomain(self, _):
         self.domains_lock.acquire()
         try:
             self.refresh()
diff -r a4071af0a463 -r c43d7806ca5a tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am Tue Mar 28 12:42:28 2006
+++ b/tools/xm-test/ramdisk/Makefile.am Tue Mar 28 12:43:22 2006
@@ -1,3 +1,4 @@
+INITRD ?= http://xm-test.xensource.com/ramdisks
 
 EXTRA_DIST = skel configs patches
 
@@ -60,7 +61,7 @@
        fi
 
 existing:
-       @if test -n "$(INITRD)"; then \
+       @if [ -n "$(INITRD)" ] && [ ! -f $(XMTEST_VER_IMG) ] ; then \
                wget $(INITRD)/$(XMTEST_VER_IMG); \
        fi
        @if [ -f $(XMTEST_VER_IMG) ] ; then \
diff -r a4071af0a463 -r c43d7806ca5a 
tools/xm-test/ramdisk/README-XenSource-initrd-0.7-img
--- /dev/null   Tue Mar 28 12:42:28 2006
+++ b/tools/xm-test/ramdisk/README-XenSource-initrd-0.7-img     Tue Mar 28 
12:43:22 2006
@@ -0,0 +1,42 @@
+XenSource xm-test 0.7 initrd.img
+================================
+
+http://xm-test.xensource.com/ramdisks/initrd-0.7.img is an initrd suitable for
+use with Xen's xm-test regression testing suite.  It has been built and
+provided by XenSource, for the convenience of Xen users.  xm-test initrds may
+be mixed across minor xm-test versions, but not across major versions; this
+initrd is suitable for all 0.7.x versions of xm-test (as shipped with Xen
+3.0.x).
+
+In order to use this initrd, run "./autogen; ./configure; make existing"
+inside the xm-test directory, and the initrd will be downloaded automatically.
+Alternatively, if you have already downloaded this file, place it into the
+xm-test/ramdisk directory and run the same command.  In either case,
+runtest.sh can then be used as normal.  See xm-test/README for more details.
+
+This initrd was built using the infrastructure provided by xm-test.  It is a
+full guest operating system and filesystem, and as such includes a large
+number of pieces of software.  The source code for the majority of these are
+included in full inside the file
+http://xm-test.xensource.com/ramdisks/initrd.0.7.img-buildroot.tar.bz2, or
+alongside this file.  Copyright statements and licences are contained therein.
+The remaining source code is included in the Xen distribution, at
+http://www.xensource.com/xen/downloads/archives.html.  The configurations used
+for BusyBox, uClibc, and Buildroot are available as
+http://xm-test.xensource.com/ramdisks/initrd-0.7-busybox-config,
+http://xm-test.xensource.com/ramdisks/initrd-0.7-uClibc-config, and
+http://xm-test.xensource.com/ramdisks/initrd-0.7-buildroot-config
+respectively, or alongside this file.
+
+XenSource and the Xen contributors are grateful to the authors of these
+software packages for their contributions to free and open-source software.
+
+
+Buildroot and BusyBox are Copyright (c) Erik Andersen <andersen@xxxxxxxxxxxx>.
+BusyBox is licensed under the GNU General Public License (GPL).  A copy of
+this license is available in the file GPL-2,
+http://xm-test.xensource.com/ramdisks/GPL-2, or alongside this file.
+
+uClibc is licensed under the GNU Lesser General Public License (LGPL).  A copy
+of this license is available in the file
+http://xm-test.xensource.com/ramdisks/LGPL-2, or alongside this file.

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