[Xen-changelog] [xen-unstable] xend: Fix bug in superpage flag handling

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1255074822 -3600
# Node ID 0e6c04748fd277909fd82e555c8bf5f8bf756ca1
# Parent  1d7221667204a6b51afa1b20a542507882e9e2bd
xend: Fix bug in superpage flag handling

During testing I discovered that using a bootloader magically clears
the superpage flag out of the config.  This small patch fixes that
behavior.

From: Dave McCracken <dcm@xxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -r 1d7221667204 -r 0e6c04748fd2 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Oct 08 09:24:32 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Fri Oct 09 08:53:42 2009 +0100
@@ -2017,7 +2017,9 @@ class XendConfig(dict):
             self['use_tmp_kernel'] = False
             self['use_tmp_ramdisk'] = False
 
-        self['superpages'] = sxp.child_value(image_sxp, 'superpages',0)
+        val = sxp.child_value(image_sxp, 'superpages')
+        if val is not None:
+            self['superpages'] = val
 
         for key in XENAPI_PLATFORM_CFG_TYPES.keys():
             val = sxp.child_value(image_sxp, key, None)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog