[Xen-changelog] [xen-unstable] xend: Unbreak live migration with tapdisk2 after 20691:054042ba73b6

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1264064580 0
# Node ID aa00760933df035e001cbb636679444fe9198e77
# Parent  f300b53520d0b13696f6ca6669fff8ad54289817
xend: Unbreak live migration with tapdisk2 after 20691:054042ba73b6

vm.image does not exist at this point in the restore process.
I haven't looked at the memory_sharing code. It's likely something
better is needed to make that work across relocation.

Signed-off-by: Brendan Cully <brendan@xxxxxxxxx>
---
 tools/python/xen/xend/server/BlktapController.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r f300b53520d0 -r aa00760933df 
tools/python/xen/xend/server/BlktapController.py
--- a/tools/python/xen/xend/server/BlktapController.py  Wed Jan 20 20:36:19 
2010 +0000
+++ b/tools/python/xen/xend/server/BlktapController.py  Thu Jan 21 09:03:00 
2010 +0000
@@ -198,7 +198,7 @@ class Blktap2Controller(BlktapController
                     self.deviceClass = 'tap2'
                     return devid
 
-        if self.vm.image.memory_sharing:
+        if self.vm.image and self.vm.image.memory_sharing:
             cmd = [ TAPDISK_BINARY, '-n', '%s:%s' % (params, file), '-s', '%d' 
% self.vm.getDomid() ]
         else:
             cmd = [ TAPDISK_BINARY, '-n', '%s:%s' % (params, file) ]

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