800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
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.1.2-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
@@ -405,8 +405,7 @@ def restore(xd, fd, dominfo = None, paus
|
|
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)
|
|
|
|
wait_devs(dominfo)
|
|
|
|
Index: xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -3053,7 +3053,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")
|
|
|
|
@@ -3064,6 +3064,7 @@ class XendDomainInfo:
|
|
self.image = image.create(self, self.info)
|
|
if self.image:
|
|
self._createDevices(True)
|
|
+ self.console_port = console_port
|
|
self._storeDomDetails()
|
|
self._registerWatches()
|
|
self.refreshShutdown()
|