80e28a00ec
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed in 3.6-rc1 - bnc#778105 - first XEN-PV VM fails to spawn xend: Increase wait time for disk to appear in host bootloader Modified existing xen-domUloader.diff - Disable the snapshot patches. Snapshot only supported the qcow2 image format which was poorly implemented qemu 0.10.2. Snapshot support may be restored in the future when the newer upstream qemu is used by Xen. - bnc#776995 - attaching scsi control luns with pvscsi - xend/pvscsi: fix passing of SCSI control LUNs xen-bug776995-pvscsi-no-devname.patch - xend/pvscsi: fix usage of persistant device names for SCSI devices xen-bug776995-pvscsi-persistent-names.patch - xend/pvscsi: update sysfs parser for Linux 3.0 xen-bug776995-pvscsi-sysfs-parser.patch - Update to Xen 4.2.0 RC3+ c/s 25779 - Update to Xen 4.2.0 RC2+ c/s 25765 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
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.2.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
@@ -329,8 +329,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)
|
|
|
|
#
|
|
# We shouldn't hold the domains_lock over a waitForDevices
|
|
Index: xen-4.2.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -3062,7 +3062,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")
|
|
|
|
@@ -3073,6 +3073,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()
|