ia64/xen-unstable

changeset 19742:376c0749586e

xend: Show "bootable" information only once in 'xm list --long'

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jun 16 10:55:36 2009 +0100 (2009-06-16)
parents 465950bbdf46
children c23aeb37b17f
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Tue Jun 16 10:54:10 2009 +0100
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Tue Jun 16 10:55:36 2009 +0100
     1.3 @@ -1100,12 +1100,11 @@ class XendConfig(dict):
     1.4                              configs = controller.configurations(txn)
     1.5                              for config in configs:
     1.6                                  if sxp.name(config) in ('vbd', 'tap'):
     1.7 -                                    # The bootable flag is never written to the
     1.8 -                                    # store as part of the device config.
     1.9                                      dev_uuid = sxp.child_value(config, 'uuid')
    1.10                                      dev_type, dev_cfg = self['devices'][dev_uuid]
    1.11 -                                    is_bootable = dev_cfg.get('bootable', 0)
    1.12 -                                    config.append(['bootable', int(is_bootable)])
    1.13 +                                    if sxp.child_value(config, 'bootable', None) is None:
    1.14 +                                        is_bootable = dev_cfg.get('bootable', 0)
    1.15 +                                        config.append(['bootable', int(is_bootable)])
    1.16                                      config.append(['VDI', dev_cfg.get('VDI', '')])
    1.17  
    1.18                                  sxpr.append(['device', config])