ia64/xen-unstable

changeset 14522:abd9ae4f1f17

Remove duplicate memory values from the SXP.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Thu Mar 22 18:37:37 2007 +0000 (2007-03-22)
parents fa731dfb90d6
children 1fc6efdab399
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Thu Mar 22 18:36:53 2007 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Thu Mar 22 18:37:37 2007 +0000
     1.3 @@ -44,7 +44,7 @@ def reverse_dict(adict):
     1.4      return dict([(v, k) for k, v in adict.items()])
     1.5  
     1.6  def bool0(v):
     1.7 -    return v != '0' and bool(v)
     1.8 +    return v != '0' and v != 'False' and bool(v)
     1.9  
    1.10  # Recursively copy a data struct, scrubbing out VNC passwords.
    1.11  # Will scrub any dict entry with a key of 'vncpasswd' or any
    1.12 @@ -128,7 +128,6 @@ XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 
    1.13  
    1.14  XENAPI_CFG_TYPES = {
    1.15      'uuid': str,
    1.16 -    'power_state': str,
    1.17      'name_label': str,
    1.18      'name_description': str,
    1.19      'user_version': str,
    1.20 @@ -854,16 +853,6 @@ class XendConfig(dict):
    1.21          sxpr.append(["maxmem", int(self["memory_static_max"])/MiB])
    1.22          sxpr.append(["memory", int(self["memory_dynamic_max"])/MiB])
    1.23  
    1.24 -        if not legacy_only:
    1.25 -            sxpr.append(['memory_dynamic_min',
    1.26 -                     int(self.get('memory_dynamic_min'))])
    1.27 -            sxpr.append(['memory_dynamic_max',
    1.28 -                     int(self.get('memory_dynamic_max'))])
    1.29 -            sxpr.append(['memory_static_max',
    1.30 -                     int(self.get('memory_static_max'))])
    1.31 -            sxpr.append(['memory_static_min',
    1.32 -                     int(self.get('memory_static_min'))])
    1.33 -
    1.34          for legacy in LEGACY_UNSUPPORTED_BY_XENAPI_CFG:
    1.35              if legacy in ('domid', 'uuid'): # skip these
    1.36                  continue