[Xen-changelog] [xen-unstable] Merge.

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

# HG changeset patch
# User Steven Smith <ssmith@xxxxxxxxxxxxx>
# Node ID 4b6284d2c11c1d08b5c775b68243eb9048a7f120
# Parent  9e24cd7951ead9088e262de42bd9aa7f5cbd9747
# Parent  fd13d7150dd61f172ab792218ff5e61b765ec5b3
Merge.
---
 tools/python/xen/xend/XendCheckpoint.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 9e24cd7951ea -r 4b6284d2c11c tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Mon Sep 25 09:26:51 2006 +0100
+++ b/tools/python/xen/xend/XendCheckpoint.py   Mon Sep 25 09:27:46 2006 +0100
@@ -161,8 +161,8 @@ def restore(xd, fd):
         if handler.store_mfn is None or handler.console_mfn is None:
             raise XendError('Could not read store/console MFN')
 
-        #Block until src closes connection
-        os.read(fd, 1)
+        os.read(fd, 1)           # Wait for source to close connection
+        dominfo.waitForDevices() # Wait for backends to set up
         dominfo.unpause()
         
         dominfo.completeRestore(handler.store_mfn, handler.console_mfn)

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