ia64/xen-unstable

changeset 16041:93b7f47407bc

Revert 15642:207582c8d88b532783da5c6f5839336187556f0a.

This patch is now bogus since 15168:a717cb2fac90 is reverted
by 15973:8817a53c030f.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
author Keir Fraser <keir@xensource.com>
date Tue Oct 02 09:59:39 2007 +0100 (2007-10-02)
parents 8426ac1a5df8
children a345f9897226
files tools/python/xen/xend/XendDomain.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomain.py	Tue Oct 02 09:56:53 2007 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomain.py	Tue Oct 02 09:59:39 2007 +0100
     1.3 @@ -51,7 +51,6 @@ from xen.xend.xenstore.xstransact import
     1.4  from xen.xend.xenstore.xswatch import xswatch
     1.5  from xen.util import mkdir
     1.6  from xen.xend import uuid
     1.7 -from xen.xend import sxp
     1.8  
     1.9  xc = xen.lowlevel.xc.xc()
    1.10  xoptions = XendOptions.instance() 
    1.11 @@ -969,31 +968,6 @@ class XendDomain:
    1.12          try:
    1.13              try:
    1.14                  domconfig = XendConfig.XendConfig(sxp_obj = config)
    1.15 -                
    1.16 -                domains = self.list('all')
    1.17 -                domains = map(lambda dom: dom.sxpr(), domains)
    1.18 -                for dom in domains:
    1.19 -                    if sxp.child_value(config, 'uuid', None):
    1.20 -                        if domconfig['uuid'] == sxp.child_value(dom, 'uuid'):
    1.21 -                            if domconfig['name_label'] != sxp.child_value(dom, 'name'):
    1.22 -                                raise XendError("Domain UUID '%s' is already used." % \
    1.23 -                                                domconfig['uuid'])
    1.24 -                            else:
    1.25 -                                # Update the config for that existing domain
    1.26 -                                # because it is same name and same UUID.
    1.27 -                                break
    1.28 -                        else:
    1.29 -                            if domconfig['name_label'] == sxp.child_value(dom, 'name'):
    1.30 -                                raise XendError("Domain name '%s' is already used." % \
    1.31 -                                                domconfig['name_label'])
    1.32 -                    else:
    1.33 -                        if domconfig['name_label'] == sxp.child_value(dom, 'name'):
    1.34 -                            # Overwrite the auto-generated UUID by the UUID
    1.35 -                            # of the existing domain. And update the config
    1.36 -                            # for that existing domain.
    1.37 -                            domconfig['uuid'] = sxp.child_value(dom, 'uuid')
    1.38 -                            break
    1.39 -                
    1.40                  dominfo = XendDomainInfo.createDormant(domconfig)
    1.41                  log.debug("Creating new managed domain: %s" %
    1.42                            dominfo.getName())