25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
# Date 1201949604 0
|
||
|
|
# Node ID b1b93caa7d8e2414af06f06c3a9734675f715bad
|
||
|
|
# Parent 5d84464dc1fc013110c25dc0ff1f99585e699fa3
|
||
|
|
xend: Fix grow of the LEGACY_UNSUPPORTED_BY_XENAPI_CFG list each time
|
||
|
|
we instantiate a new XendConfig.
|
||
|
|
Signed-off-by: Pascal Bouchareine <pascal@gandi.net>
|
||
|
|
|
||
|
|
Index: xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.2-testing.orig/tools/python/xen/xend/XendConfig.py
|
||
|
|
+++ xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
||
|
|
@@ -501,8 +501,8 @@ class XendConfig(dict):
|
||
|
|
int(sxp.child_value(sxp_cfg, "cpu_cap", 0))
|
||
|
|
|
||
|
|
# Only extract options we know about.
|
||
|
|
- extract_keys = LEGACY_UNSUPPORTED_BY_XENAPI_CFG
|
||
|
|
- extract_keys += XENAPI_CFG_TO_LEGACY_CFG.values()
|
||
|
|
+ extract_keys = LEGACY_UNSUPPORTED_BY_XENAPI_CFG + \
|
||
|
|
+ XENAPI_CFG_TO_LEGACY_CFG.values()
|
||
|
|
|
||
|
|
for key in extract_keys:
|
||
|
|
val = sxp.child_value(sxp_cfg, key)
|