[Xen-changelog] merge.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 8b095815538060dc1bf5f07ed897010ee880f207
# Parent  306f6ec86ea86c9b582de891dfc43c6b39a0fc36
# Parent  f3c59064100076db0efa38ff075591eeffe33c1a
merge.

diff -r 306f6ec86ea8 -r 8b0958155380 tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Fri Oct  7 10:03:56 2005
+++ b/tools/python/xen/xend/XendCheckpoint.py   Fri Oct  7 10:04: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