7f6bd728fd
xend-cpuid.patch - Rename 2XXXX-vif-bridge.patch -> vif-bridge-tap-fix.patch - bnc#747331 - XEN: standard "newburn" kernel QA stress test on guest (+ smartd on Dom0?) freezes the guest 24883-x86-guest-walk-not-present.patch - bnc#745367 - MCE bank handling during migration 24781-x86-vmce-mcg_ctl.patch 24886-x86-vmce-mcg_ctl-default.patch 24887-x86-vmce-sr.patch - bnc#744771 - L3: VM with passed through PCI card fails to reboot under dom0 load 24888-pci-release-devices.patch - Upstream patches from Jan 24517-VT-d-fault-softirq.patch 24527-AMD-Vi-fault-softirq.patch 24535-x86-vMSI-misc.patch 24615-VESA-lfb-flush.patch 24690-x86-PCI-SERR-no-deadlock.patch 24701-gnttab-map-grant-ref-recovery.patch 24742-gnttab-misc.patch 24780-x86-paging-use-clear_guest.patch 24805-x86-MSI-X-dom0-ro.patch ioemu-9869-MSI-X-init.patch ioemu-9873-MSI-X-fix-unregister_iomem.patch - bnc#745005 - Update vif configuration examples in xmexample* Updated xen-xmexample.diff OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=172
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
Only add cpuid and cpuid_check to sexpr once
|
|
|
|
When converting a XendConfig object to sexpr, cpuid and cpuid_check
|
|
were being emitted twice in the resulting sexpr. The first conversion
|
|
writes incorrect sexpr, causing parsing of the sexpr to fail when xend
|
|
is restarted and domain sexpr files in /var/lib/xend/domains/<dom-uuid>
|
|
are read and parsed.
|
|
|
|
This patch skips the first conversion, and uses only the custom
|
|
cpuid{_check} conversion methods called later. It is not pretty, but
|
|
is the least invasive fix in this complex code.
|
|
Index: xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -1125,6 +1125,10 @@ class XendConfig(dict):
|
|
else:
|
|
for name, typ in XENAPI_CFG_TYPES.items():
|
|
if name in self and self[name] not in (None, []):
|
|
+ # Skip cpuid and cpuid_check. Custom conversion
|
|
+ # methods for these are called below.
|
|
+ if name in ("cpuid", "cpuid_check"):
|
|
+ continue
|
|
if typ == dict:
|
|
s = self[name].items()
|
|
elif typ == list:
|