debuggers.hg

changeset 20876:aa00760933df

find changesets by author, revision, files, or words in the commit message
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@cs.ubc.ca>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jan 21 09:03:00 2010 +0000 (2010-01-21)
parents f300b53520d0
children 6a5d8284b6e6
files tools/python/xen/xend/server/BlktapController.py
line diff
     1.1 --- a/tools/python/xen/xend/server/BlktapController.py	Wed Jan 20 20:36:19 2010 +0000
     1.2 +++ b/tools/python/xen/xend/server/BlktapController.py	Thu Jan 21 09:03:00 2010 +0000
     1.3 @@ -198,7 +198,7 @@ class Blktap2Controller(BlktapController
     1.4                      self.deviceClass = 'tap2'
     1.5                      return devid
     1.6  
     1.7 -        if self.vm.image.memory_sharing:
     1.8 +        if self.vm.image and self.vm.image.memory_sharing:
     1.9              cmd = [ TAPDISK_BINARY, '-n', '%s:%s' % (params, file), '-s', '%d' % self.vm.getDomid() ]
    1.10          else:
    1.11              cmd = [ TAPDISK_BINARY, '-n', '%s:%s' % (params, file) ]