2014-01-02 20:09:07 +01:00
|
|
|
Pass console_port to completeRestore() so that console/port is written to
|
|
|
|
|
xenstore. See bnc#706574
|
|
|
|
|
|
|
|
|
|
From: Chunyan Liu <cyliu@novell.com>
|
|
|
|
|
|
|
|
|
|
Index: xen-4.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
|
|
|
===================================================================
|
|
|
|
|
--- xen-4.4.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
|
|
|
|
|
+++ xen-4.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
2014-02-11 21:53:28 +01:00
|
|
|
@@ -347,8 +347,7 @@ def restore(xd, fd, dominfo = None, paus
|
2014-01-02 20:09:07 +01:00
|
|
|
restore_image.setCpuid()
|
|
|
|
|
|
|
|
|
|
# xc_restore will wait for source to close connection
|
|
|
|
|
-
|
|
|
|
|
- dominfo.completeRestore(handler.store_mfn, handler.console_mfn)
|
|
|
|
|
+ dominfo.completeRestore(handler.store_mfn, handler.console_mfn, console_port)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# We shouldn't hold the domains_lock over a waitForDevices
|
|
|
|
|
Index: xen-4.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
|
|
|
===================================================================
|
|
|
|
|
--- xen-4.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
|
|
|
+++ xen-4.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
|
|
|
@@ -3083,7 +3083,7 @@ class XendDomainInfo:
|
|
|
|
|
# TODO: recategorise - called from XendCheckpoint
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
- def completeRestore(self, store_mfn, console_mfn):
|
|
|
|
|
+ def completeRestore(self, store_mfn, console_mfn, console_port):
|
|
|
|
|
|
|
|
|
|
log.debug("XendDomainInfo.completeRestore")
|
|
|
|
|
|
|
|
|
|
@@ -3094,6 +3094,7 @@ class XendDomainInfo:
|
|
|
|
|
self.image = image.create(self, self.info)
|
|
|
|
|
if self.image:
|
|
|
|
|
self.image.createDeviceModel(True)
|
|
|
|
|
+ self.console_port = console_port
|
|
|
|
|
self._storeDomDetails()
|
|
|
|
|
self._registerWatches()
|
|
|
|
|
self.refreshShutdown()
|
