ia64/xen-unstable

changeset 9473:c43d7806ca5a

merge
author kaf24@firebug.cl.cam.ac.uk
date Tue Mar 28 13:43:22 2006 +0100 (2006-03-28)
parents a4071af0a463 c745e47d8154
children 98eaa430bdf3
files
line diff
     1.1 --- a/tools/python/xen/util/xmlrpclib2.py	Tue Mar 28 13:42:28 2006 +0100
     1.2 +++ b/tools/python/xen/util/xmlrpclib2.py	Tue Mar 28 13:43:22 2006 +0100
     1.3 @@ -24,6 +24,7 @@ from httplib import HTTPConnection, HTTP
     1.4  from xmlrpclib import Transport
     1.5  from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
     1.6  import xmlrpclib, socket, os, traceback
     1.7 +import SocketServer
     1.8  
     1.9  # A new ServerProxy that also supports httpu urls.  An http URL comes in the
    1.10  # form:
    1.11 @@ -62,7 +63,7 @@ class ServerProxy(xmlrpclib.ServerProxy)
    1.12  # true, and has an improved marshaller that serializes unknown exceptions
    1.13  # with full traceback information.
    1.14  
    1.15 -class TCPXMLRPCServer(SimpleXMLRPCServer):
    1.16 +class TCPXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer):
    1.17      allow_reuse_address = True
    1.18  
    1.19      def _marshaled_dispatch(self, data, dispatch_method = None):
     2.1 --- a/tools/python/xen/xend/XendDomain.py	Tue Mar 28 13:42:28 2006 +0100
     2.2 +++ b/tools/python/xen/xend/XendDomain.py	Tue Mar 28 13:43:22 2006 +0100
     2.3 @@ -81,7 +81,8 @@ class XendDomain:
     2.4              # that we're sure that we haven't missed any releases, but inside
     2.5              # the domains_lock, as we don't want the watch to fire until after
     2.6              # the refresh call has completed.
     2.7 -            xswatch("@releaseDomain", self.onReleaseDomain)
     2.8 +            xswatch("@introduceDomain", self.onChangeDomain)
     2.9 +            xswatch("@releaseDomain",   self.onChangeDomain)
    2.10              
    2.11              self.refresh(True)
    2.12          finally:
    2.13 @@ -121,7 +122,7 @@ class XendDomain:
    2.14  
    2.15      ## private:
    2.16  
    2.17 -    def onReleaseDomain(self, _):
    2.18 +    def onChangeDomain(self, _):
    2.19          self.domains_lock.acquire()
    2.20          try:
    2.21              self.refresh()
     3.1 --- a/tools/xm-test/ramdisk/Makefile.am	Tue Mar 28 13:42:28 2006 +0100
     3.2 +++ b/tools/xm-test/ramdisk/Makefile.am	Tue Mar 28 13:43:22 2006 +0100
     3.3 @@ -1,3 +1,4 @@
     3.4 +INITRD ?= http://xm-test.xensource.com/ramdisks
     3.5  
     3.6  EXTRA_DIST = skel configs patches
     3.7  
     3.8 @@ -60,7 +61,7 @@ disk.img: existing
     3.9  	fi
    3.10  
    3.11  existing:
    3.12 -	@if test -n "$(INITRD)"; then \
    3.13 +	@if [ -n "$(INITRD)" ] && [ ! -f $(XMTEST_VER_IMG) ] ; then \
    3.14  		wget $(INITRD)/$(XMTEST_VER_IMG); \
    3.15  	fi
    3.16  	@if [ -f $(XMTEST_VER_IMG) ] ; then \
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/xm-test/ramdisk/README-XenSource-initrd-0.7-img	Tue Mar 28 13:43:22 2006 +0100
     4.3 @@ -0,0 +1,42 @@
     4.4 +XenSource xm-test 0.7 initrd.img
     4.5 +================================
     4.6 +
     4.7 +http://xm-test.xensource.com/ramdisks/initrd-0.7.img is an initrd suitable for
     4.8 +use with Xen's xm-test regression testing suite.  It has been built and
     4.9 +provided by XenSource, for the convenience of Xen users.  xm-test initrds may
    4.10 +be mixed across minor xm-test versions, but not across major versions; this
    4.11 +initrd is suitable for all 0.7.x versions of xm-test (as shipped with Xen
    4.12 +3.0.x).
    4.13 +
    4.14 +In order to use this initrd, run "./autogen; ./configure; make existing"
    4.15 +inside the xm-test directory, and the initrd will be downloaded automatically.
    4.16 +Alternatively, if you have already downloaded this file, place it into the
    4.17 +xm-test/ramdisk directory and run the same command.  In either case,
    4.18 +runtest.sh can then be used as normal.  See xm-test/README for more details.
    4.19 +
    4.20 +This initrd was built using the infrastructure provided by xm-test.  It is a
    4.21 +full guest operating system and filesystem, and as such includes a large
    4.22 +number of pieces of software.  The source code for the majority of these are
    4.23 +included in full inside the file
    4.24 +http://xm-test.xensource.com/ramdisks/initrd.0.7.img-buildroot.tar.bz2, or
    4.25 +alongside this file.  Copyright statements and licences are contained therein.
    4.26 +The remaining source code is included in the Xen distribution, at
    4.27 +http://www.xensource.com/xen/downloads/archives.html.  The configurations used
    4.28 +for BusyBox, uClibc, and Buildroot are available as
    4.29 +http://xm-test.xensource.com/ramdisks/initrd-0.7-busybox-config,
    4.30 +http://xm-test.xensource.com/ramdisks/initrd-0.7-uClibc-config, and
    4.31 +http://xm-test.xensource.com/ramdisks/initrd-0.7-buildroot-config
    4.32 +respectively, or alongside this file.
    4.33 +
    4.34 +XenSource and the Xen contributors are grateful to the authors of these
    4.35 +software packages for their contributions to free and open-source software.
    4.36 +
    4.37 +
    4.38 +Buildroot and BusyBox are Copyright (c) Erik Andersen <andersen@codepoet.org>.
    4.39 +BusyBox is licensed under the GNU General Public License (GPL).  A copy of
    4.40 +this license is available in the file GPL-2,
    4.41 +http://xm-test.xensource.com/ramdisks/GPL-2, or alongside this file.
    4.42 +
    4.43 +uClibc is licensed under the GNU Lesser General Public License (LGPL).  A copy
    4.44 +of this license is available in the file
    4.45 +http://xm-test.xensource.com/ramdisks/LGPL-2, or alongside this file.