[Xen-changelog] Fix conflicting merge.

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

# HG changeset patch
# User emellor@ewan
# Node ID 48df3efaf61c2cf98dc87ab1b70bd505f0096a6a
# Parent  62190db8932678b3610fb17a770e6a02dedfdb3a
Fix conflicting merge.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>

diff -r 62190db89326 -r 48df3efaf61c tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Thu Oct  6 18:43:11 2005
+++ b/tools/python/xen/xend/XendCheckpoint.py   Thu Oct  6 23:21:00 2005
@@ -142,7 +142,7 @@
                 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,

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