From 4b5059be627aa68e5cd6ef344b21ce6743f3f9df Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 14 Feb 2013 17:18:56 +0000 Subject: xend: Only add cpuid and cpuid_check to sexpr once tools/xend: 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/ 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. Signed-off-by: Olaf Hering --- tools/python/xen/xend/XendConfig.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/python') diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 497a5f4b11..4a226a7155 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -1124,6 +1124,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: -- cgit v1.2.3