[Xen-changelog] [xen-unstable] Fix managed domain rebooting by only complaining about a VM name conflict if

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID fbfbc6ed47d99be3596e94a0dc3381533a8e5656
# Parent  2e529124878960e321d9dcf8c9a355805fd18ac3
Fix managed domain rebooting by only complaining about a VM name conflict if
the VM UUID conflicts as well.

Also, remove the previous_restart_time node when explicitly rebooting a guest --
the user ought to be able to drive reboots faster than the safety catch.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -r 2e5291248789 -r fbfbc6ed47d9 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Nov 30 19:11:51 2006 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Nov 30 20:07:58 2006 +0000
@@ -479,8 +479,9 @@ class XendDomainInfo:
         
         if reason not in DOMAIN_SHUTDOWN_REASONS.values():
             raise XendError('Invalid reason: %s' % reason)
+        self._removeVm('xend/previous_restart_time')
         self.storeDom("control/shutdown", reason)
-                
+
     def pause(self):
         """Pause domain
         
@@ -1692,8 +1693,9 @@ class XendDomainInfo:
             raise VmError('Invalid VM Name')
 
         dom =  XendDomain.instance().domain_lookup_nr(name)
-        if dom and dom != self and not dom.info['dying']:
-            raise VmError("VM name '%s' already exists" % name)
+        if dom and dom.info['uuid'] != self.info['uuid']:
+            raise VmError("VM name '%s' already exists as domain %s" %
+                          (name, str(dom.domid)))
         
 
     def update(self, info = None, refresh = True):

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