[Xen-changelog] [xen-unstable] Return the domain renaming during migration.

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 4e17bf788e690b1550187c00f8e567153435948c
# Parent  7b5115221dfc1c139a8459cc8e95341e7b880ea6
Return the domain renaming during migration.

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

diff -r 7b5115221dfc -r 4e17bf788e69 tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Wed Nov 01 16:08:19 2006 +0000
+++ b/tools/python/xen/xend/XendCheckpoint.py   Wed Nov 01 18:20:23 2006 +0000
@@ -59,9 +59,7 @@ def save(fd, dominfo, network, live, dst
     # 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.
-    #
-    # FIXME: I don't think this is such a good idea - atse@xxxxxxxxxxxxx
-    #dominfo.setName('migrating-' + domain_name)
+    dominfo.setName('migrating-' + domain_name)
 
     try:
         dominfo.migrateDevices(network, dst, DEV_MIGRATE_STEP1, domain_name)
@@ -102,10 +100,10 @@ def save(fd, dominfo, network, live, dst
     except Exception, exn:
         log.exception("Save failed on domain %s (%d).", domain_name,
                       dominfo.getDomid())
-        #try:
-        #    dominfo.setName(domain_name)
-        #except:
-        #    log.exception("Failed to reset the migrating domain's name")
+        try:
+            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