[Xen-changelog] [xen-unstable] Revert 15642:207582c8d88b532783da5c6f5839336187556f0a.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191315579 -3600
# Node ID 93b7f47407bce69a8c048d8a0402222fb7a08e9b
# Parent  8426ac1a5df8acd1996733dbc2ecb1d3a8f418c8
Revert 15642:207582c8d88b532783da5c6f5839336187556f0a.

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

Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 tools/python/xen/xend/XendDomain.py |   26 --------------------------
 1 files changed, 26 deletions(-)

diff -r 8426ac1a5df8 -r 93b7f47407bc tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Tue Oct 02 09:56:53 2007 +0100
+++ b/tools/python/xen/xend/XendDomain.py       Tue Oct 02 09:59:39 2007 +0100
@@ -51,7 +51,6 @@ from xen.xend.xenstore.xswatch import xs
 from xen.xend.xenstore.xswatch import xswatch
 from xen.util import mkdir
 from xen.xend import uuid
-from xen.xend import sxp
 
 xc = xen.lowlevel.xc.xc()
 xoptions = XendOptions.instance() 
@@ -969,31 +968,6 @@ class XendDomain:
         try:
             try:
                 domconfig = XendConfig.XendConfig(sxp_obj = config)
-                
-                domains = self.list('all')
-                domains = map(lambda dom: dom.sxpr(), domains)
-                for dom in domains:
-                    if sxp.child_value(config, 'uuid', None):
-                        if domconfig['uuid'] == sxp.child_value(dom, 'uuid'):
-                            if domconfig['name_label'] != sxp.child_value(dom, 
'name'):
-                                raise XendError("Domain UUID '%s' is already 
used." % \
-                                                domconfig['uuid'])
-                            else:
-                                # Update the config for that existing domain
-                                # because it is same name and same UUID.
-                                break
-                        else:
-                            if domconfig['name_label'] == sxp.child_value(dom, 
'name'):
-                                raise XendError("Domain name '%s' is already 
used." % \
-                                                domconfig['name_label'])
-                    else:
-                        if domconfig['name_label'] == sxp.child_value(dom, 
'name'):
-                            # Overwrite the auto-generated UUID by the UUID
-                            # of the existing domain. And update the config
-                            # for that existing domain.
-                            domconfig['uuid'] = sxp.child_value(dom, 'uuid')
-                            break
-                
                 dominfo = XendDomainInfo.createDormant(domconfig)
                 log.debug("Creating new managed domain: %s" %
                           dominfo.getName())

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