direct-io.hg

changeset 7240:48df3efaf61c

Fix conflicting merge.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@ewan
date Fri Oct 07 00:21:00 2005 +0100 (2005-10-07)
parents 62190db89326
children 37bea65ed6ca 7079bb72ceca
files tools/python/xen/xend/XendCheckpoint.py
line diff
     1.1 --- a/tools/python/xen/xend/XendCheckpoint.py	Thu Oct 06 19:43:11 2005 +0100
     1.2 +++ b/tools/python/xen/xend/XendCheckpoint.py	Fri Oct 07 00:21:00 2005 +0100
     1.3 @@ -142,7 +142,7 @@ def restore(xd, fd):
     1.4                  log.debug("IntroduceDomain %d %d %d %s",
     1.5                            dominfo.getDomid(),
     1.6                            store_mfn,
     1.7 -                          dominfo.store_channel.port1,
     1.8 +                          dominfo.store_channel,
     1.9                            dominfo.getDomainPath())
    1.10                  IntroduceDomain(dominfo.getDomid(),
    1.11                                  store_mfn,