[Xen-changelog] [xen-unstable] Merge

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1170158276 0
# Node ID dc5e6e65bf1058b525a2e27e6ddfe68b4dfd6d36
# Parent  0a28ad8cedf247f956cc311b18ea9473da2a5aed
# Parent  5165b7ecbff53eede602ba2c247ffe857f2c5bb9
Merge
---
 tools/python/xen/xend/XendConfig.py          |    8 ++++----
 tools/python/xen/xend/server/XMLRPCServer.py |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -r 0a28ad8cedf2 -r dc5e6e65bf10 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Tue Jan 30 11:56:25 2007 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Tue Jan 30 11:57:56 2007 +0000
@@ -881,10 +881,10 @@ class XendConfig(dict):
                             if sxp.name(config) in ('vbd', 'tap'):
                                 # The bootable flag is never written to the
                                 # store as part of the device config.
-                                uuid = sxp.child_value(sxpr, 'uuid')
-                                sxpr.append(
-                                    'bootable', 
-                                    self['devices'][dev_uuid]['bootable'])
+                                dev_uuid = sxp.child_value(config, 'uuid')
+                                dev_type, dev_cfg = self['devices'][dev_uuid]
+                                config.append(['bootable',
+                                               int(dev_cfg['bootable'])])
                             sxpr.append(['device', config])
 
                         found = True
diff -r 0a28ad8cedf2 -r dc5e6e65bf10 
tools/python/xen/xend/server/XMLRPCServer.py
--- a/tools/python/xen/xend/server/XMLRPCServer.py      Tue Jan 30 11:56:25 
2007 +0000
+++ b/tools/python/xen/xend/server/XMLRPCServer.py      Tue Jan 30 11:57:56 
2007 +0000
@@ -34,7 +34,7 @@ def fixup_sxpr(sexpr):
 def fixup_sxpr(sexpr):
     ret = []
     for k in sexpr:
-        if type(k) in (types.ListType, types.TupleType):
+        if type(k) in (list, tuple):
             if len(k) != 2 or k[0] != 'vcpu_avail':
                 ret.append(fixup_sxpr(k))
         else:

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