ia64/xen-unstable

changeset 11616:4b6284d2c11c

Merge.
author Steven Smith <ssmith@xensource.com>
date Mon Sep 25 09:27:46 2006 +0100 (2006-09-25)
parents 9e24cd7951ea fd13d7150dd6
children 83b53eeb8a5c
files
line diff
     1.1 --- a/tools/python/xen/xend/XendCheckpoint.py	Mon Sep 25 09:26:51 2006 +0100
     1.2 +++ b/tools/python/xen/xend/XendCheckpoint.py	Mon Sep 25 09:27:46 2006 +0100
     1.3 @@ -161,8 +161,8 @@ def restore(xd, fd):
     1.4          if handler.store_mfn is None or handler.console_mfn is None:
     1.5              raise XendError('Could not read store/console MFN')
     1.6  
     1.7 -        #Block until src closes connection
     1.8 -        os.read(fd, 1)
     1.9 +        os.read(fd, 1)           # Wait for source to close connection
    1.10 +        dominfo.waitForDevices() # Wait for backends to set up
    1.11          dominfo.unpause()
    1.12          
    1.13          dominfo.completeRestore(handler.store_mfn, handler.console_mfn)