9621add6e3
support qcow2, so blktap is needed to support domains with 'tap:qcow2' disk configurations. modified tmp-initscript-modprobe.patch - bnc#809203 - xen.efi isn't signed with SUSE Secure Boot key xen.spec - Fix adding managed PCI device to an inactive domain modified xen-managed-pci-device.patch - bnc#805094 - xen hot plug attach/detach fails modified blktap-pv-cdrom.patch - bnc# 802690 - domain locking can prevent a live migration from completing modified xend-domain-lock.patch - bnc#797014 - no way to control live migrations 26675-tools-xentoollog_update_tty_detection_in_stdiostream_progress.patch xen.migrate.tools-xc_print_messages_from_xc_save_with_xc_report.patch xen.migrate.tools-xc_document_printf_calls_in_xc_restore.patch xen.migrate.tools-xc_rework_xc_save.cswitch_qemu_logdirty.patch xen.migrate.tools_set_migration_constraints_from_cmdline.patch xen.migrate.tools_add_xm_migrate_--log_progress_option.patch - Upstream patches from Jan 26585-x86-mm-Take-the-p2m-lock-even-in-shadow-mode.patch 26595-x86-nhvm-properly-clean-up-after-failure-to-set-up-all-vCPU-s.patch 26601-honor-ACPI-v4-FADT-flags.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=232
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.1-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
|
|
+++ xen-4.2.1-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
@@ -342,8 +342,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.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-4.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -3076,7 +3076,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")
|
|
|
|
@@ -3087,6 +3087,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()
|