diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-07 11:04:41 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-07 11:04:41 +0100 |
| commit | f89856186ca1d579da7b7135f86a2a256c16d719 (patch) | |
| tree | 713c8a99f82129c8ca2383ec4f4a156113b0006a /tools | |
| parent | 8d840be9ee37961a04828ea6fbe18edd55280b18 (diff) | |
| parent | 6623c6da787e3d9cdfa03d3a131831af52e77a98 (diff) | |
| download | xen-f89856186ca1d579da7b7135f86a2a256c16d719.tar.gz xen-f89856186ca1d579da7b7135f86a2a256c16d719.tar.bz2 xen-f89856186ca1d579da7b7135f86a2a256c16d719.zip | |
merge.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/xend/XendCheckpoint.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 9250f71b6c..3d45bdb60a 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -48,9 +48,10 @@ def save(fd, dominfo, live): 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 @@ def save(fd, dominfo, live): 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 |