diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-21 09:03:00 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-21 09:03:00 +0000 |
| commit | 1e4743291b9e4fd7b131d9de03dcfd8a72682fd0 (patch) | |
| tree | c78b718f0eb43e8f2a3c0e5d9dd2bfa3816c0239 | |
| parent | 55274e039ff0538354ec00e96eae45e101faeb31 (diff) | |
| download | xen-1e4743291b9e4fd7b131d9de03dcfd8a72682fd0.tar.gz xen-1e4743291b9e4fd7b131d9de03dcfd8a72682fd0.tar.bz2 xen-1e4743291b9e4fd7b131d9de03dcfd8a72682fd0.zip | |
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>
| -rw-r--r-- | tools/python/xen/xend/server/BlktapController.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xend/server/BlktapController.py b/tools/python/xen/xend/server/BlktapController.py index f75e14dcc3..48cd13e152 100644 --- a/tools/python/xen/xend/server/BlktapController.py +++ b/tools/python/xen/xend/server/BlktapController.py @@ -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) ] |