direct-io.hg

changeset 13708:dc5e6e65bf10

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Tue Jan 30 11:57:56 2007 +0000 (2007-01-30)
parents 0a28ad8cedf2 5165b7ecbff5
children b9febab4c6cb
files
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Tue Jan 30 11:56:25 2007 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Tue Jan 30 11:57:56 2007 +0000
     1.3 @@ -881,10 +881,10 @@ class XendConfig(dict):
     1.4                              if sxp.name(config) in ('vbd', 'tap'):
     1.5                                  # The bootable flag is never written to the
     1.6                                  # store as part of the device config.
     1.7 -                                uuid = sxp.child_value(sxpr, 'uuid')
     1.8 -                                sxpr.append(
     1.9 -                                    'bootable', 
    1.10 -                                    self['devices'][dev_uuid]['bootable'])
    1.11 +                                dev_uuid = sxp.child_value(config, 'uuid')
    1.12 +                                dev_type, dev_cfg = self['devices'][dev_uuid]
    1.13 +                                config.append(['bootable',
    1.14 +                                               int(dev_cfg['bootable'])])
    1.15                              sxpr.append(['device', config])
    1.16  
    1.17                          found = True
     2.1 --- a/tools/python/xen/xend/server/XMLRPCServer.py	Tue Jan 30 11:56:25 2007 +0000
     2.2 +++ b/tools/python/xen/xend/server/XMLRPCServer.py	Tue Jan 30 11:57:56 2007 +0000
     2.3 @@ -34,7 +34,7 @@ from xen.xend.XendError import XendInval
     2.4  def fixup_sxpr(sexpr):
     2.5      ret = []
     2.6      for k in sexpr:
     2.7 -        if type(k) in (types.ListType, types.TupleType):
     2.8 +        if type(k) in (list, tuple):
     2.9              if len(k) != 2 or k[0] != 'vcpu_avail':
    2.10                  ret.append(fixup_sxpr(k))
    2.11          else: