diff options
| author | emellor@ewan <emellor@ewan> | 2005-10-07 00:21:00 +0100 |
|---|---|---|
| committer | emellor@ewan <emellor@ewan> | 2005-10-07 00:21:00 +0100 |
| commit | 57e576dc3cc61826682f745203cbb817f7242d94 (patch) | |
| tree | 01f427699c1f16e4db43fcd1c9e53b3e812a883e /tools | |
| parent | 2a3e2af26c4461afe878cdd0f0557baec402bfd1 (diff) | |
| download | xen-57e576dc3cc61826682f745203cbb817f7242d94.tar.gz xen-57e576dc3cc61826682f745203cbb817f7242d94.tar.bz2 xen-57e576dc3cc61826682f745203cbb817f7242d94.zip | |
Fix conflicting merge.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/xend/XendCheckpoint.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 6e6e60156f..9250f71b6c 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -142,7 +142,7 @@ def restore(xd, fd): log.debug("IntroduceDomain %d %d %d %s", dominfo.getDomid(), store_mfn, - dominfo.store_channel.port1, + dominfo.store_channel, dominfo.getDomainPath()) IntroduceDomain(dominfo.getDomid(), store_mfn, |