ia64/xen-unstable

changeset 19519:cb453e5a2f81

xend: fix c/s 19510

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Apr 08 09:02:22 2009 +0100 (2009-04-08)
parents d9de5cc2b0bc
children d61d135291f7
files tools/python/xen/xend/server/pciif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/pciif.py	Tue Apr 07 14:37:35 2009 +0100
     1.2 +++ b/tools/python/xen/xend/server/pciif.py	Wed Apr 08 09:02:22 2009 +0100
     1.3 @@ -71,6 +71,10 @@ class PciController(DevController):
     1.4          pcidevid = 0
     1.5          vslots = ""
     1.6          for pci_config in config.get('devs', []):
     1.7 +            vslot = pci_config.get('vslot')
     1.8 +            if vslot is not None:
     1.9 +                vslots = vslots + vslot + ";"
    1.10 +
    1.11              domain = parse_hex(pci_config.get('domain', 0))
    1.12              bus = parse_hex(pci_config.get('bus', 0))
    1.13              slot = parse_hex(pci_config.get('slot', 0))
    1.14 @@ -83,10 +87,6 @@ class PciController(DevController):
    1.15                  opts = reduce(lambda x, y: x+','+y, opts)
    1.16                  back['opts-%i' % pcidevid] = opts
    1.17  
    1.18 -            vslot = pci_config.get('vslot')
    1.19 -            if vslot is not None:
    1.20 -                vslots = vslots + vslot + ";"
    1.21 -
    1.22              back['dev-%i' % pcidevid] = "%04x:%02x:%02x.%01x" % \
    1.23                                          (domain, bus, slot, func)
    1.24              back['uuid-%i' % pcidevid] = pci_config.get('uuid', '')