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
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.2.0-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -1126,6 +1126,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:
|