387129caad
- bnc#803712 - after live migration rcu_sched_state detected stalls xen.migrate.tools-xend_move_assert_to_exception_block.patch xen.migrate.tools-libxc_print_stats_if_migration_is_aborted.patch xen.migrate.tools_set_number_of_dirty_pages_during_migration.patch xen.migrate.tools_notify_restore_to_hangup_during_migration_--abort_if_busy.patch - bnc#811764 - XEN (hypervisor or kernel) has a problem with EFI variable services x86-EFI-set-variable-permit-attrs.patch - Upstream patches from Jan 26060-ACPI-ERST-table-size-checks.patch 26692-x86-fully-protect-MSI-X-table-from-PV-guest-accesses.patch 26702-powernow-add-fixups-for-AMD-P-state-figures.patch 26704-x86-MCA-suppress-bank-clearing-for-certain-injected-events.patch (bnc#805579) 26731-AMD-IOMMU-Process-softirqs-while-building-dom0-iommu-mappings.patch 26733-VT-d-Enumerate-IOMMUs-when-listing-capabilities.patch 26734-ACPI-ERST-Name-table-in-otherwise-opaque-error-messages.patch 26736-ACPI-APEI-Unlock-apei_iomaps_lock-on-error-path.patch 26737-ACPI-APEI-Add-apei_exec_run_optional.patch 26742-IOMMU-properly-check-whether-interrupt-remapping-is-enabled.patch 26743-VT-d-deal-with-5500-5520-X58-errata.patch (bnc#801910) 26744-AMD-IOMMU-allow-disabling-only-interrupt-remapping.patch - PVonHVM: __devinit was removed in linux-3.8 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=234
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Thu Mar 28 15:36:02 2013 +0100
|
|
files: tools/python/xen/xend/XendCheckpoint.py
|
|
description:
|
|
tools/xend: move assert to exception block
|
|
|
|
The two assert in restore trigger sometimes after hundreds of
|
|
migrations. If they trigger the destination host will not destroy the
|
|
newly created, still empty guest. After a second migration attempt to
|
|
this host there will be two guets with the same name and uuid. This
|
|
situation is poorly handled by the xm tools.
|
|
With this change the guest will be destroyed.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/python/xen/xend/XendCheckpoint.py | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
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
|
|
@@ -262,9 +262,6 @@ def restore(xd, fd, dominfo = None, paus
|
|
store_port = dominfo.getStorePort()
|
|
console_port = dominfo.getConsolePort()
|
|
|
|
- assert store_port
|
|
- assert console_port
|
|
-
|
|
# if hvm, pass mem size to calculate the store_mfn
|
|
if is_hvm:
|
|
apic = int(dominfo.info['platform'].get('apic', 0))
|
|
@@ -276,6 +273,9 @@ def restore(xd, fd, dominfo = None, paus
|
|
pae = 0
|
|
|
|
try:
|
|
+ assert store_port
|
|
+ assert console_port
|
|
+
|
|
restore_image = image.create(dominfo, dominfo.info)
|
|
memory = restore_image.getRequiredAvailableMemory(
|
|
dominfo.info['memory_dynamic_max'] / 1024)
|