[Xen-changelog] Rename the source domain on migration, regardless of the live flag. This fixes

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

# HG changeset patch
# User emellor@ewan
# Node ID 7079bb72ceca28f0428fddcf10b93fa0f0da99d2
# Parent  48df3efaf61c2cf98dc87ab1b70bd505f0096a6a
Rename the source domain on migration, regardless of the live flag.  This fixes
localhost non-live migration, and bug #297.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>

diff -r 48df3efaf61c -r 7079bb72ceca tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Thu Oct  6 23:21:00 2005
+++ b/tools/python/xen/xend/XendCheckpoint.py   Fri Oct  7 09:58:41 2005
@@ -48,9 +48,10 @@
     config = sxp.to_string(dominfo.sxpr())
 
     domain_name = dominfo.getName()
-
-    if live:
-        dominfo.setName('migrating-' + domain_name)
+    # Rename the domain temporarily, so that we don't get a name clash if this
+    # domain is migrating (live or non-live) to the local host.  Doing such a
+    # thing is useful for debugging.
+    dominfo.setName('migrating-' + domain_name)
 
     try:
         write_exact(fd, pack("!i", len(config)),
@@ -85,8 +86,7 @@
         log.exception("Save failed on domain %s (%d).", domain_name,
                       dominfo.getDomid())
         try:
-            if live:
-                dominfo.setName(domain_name)
+            dominfo.setName(domain_name)
         except:
             log.exception("Failed to reset the migrating domain's name")
         raise Exception, exn

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