diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-06-04 10:43:20 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-06-04 10:43:20 +0100 |
| commit | 9a2e04d1d11e731f5bd79f1a2bdc55335393c308 (patch) | |
| tree | 082244dd6b72b29e09fea454e9245d441df4d564 | |
| parent | 54ceba35a1fdf2326e407c4e41b76ee5abd93fa3 (diff) | |
| download | xen-9a2e04d1d11e731f5bd79f1a2bdc55335393c308.tar.gz xen-9a2e04d1d11e731f5bd79f1a2bdc55335393c308.tar.bz2 xen-9a2e04d1d11e731f5bd79f1a2bdc55335393c308.zip | |
xend: pass-through: Use AUTO_PHP_SLOT as unknown vslot
This fixes a few cases where 0 is still used for an known vslot.
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | tools/python/xen/xend/XendConfig.py | 5 | ||||
| -rw-r--r-- | tools/python/xen/xend/server/pciif.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index bc072720ee..6ac11928f6 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -31,7 +31,7 @@ from xen.xend.XendDSCSI import XendDSCSI from xen.xend.XendError import VmError from xen.xend.XendDevices import XendDevices from xen.xend.PrettyPrint import prettyprintstring -from xen.xend.XendConstants import DOM_STATE_HALTED +from xen.xend.XendConstants import DOM_STATE_HALTED, AUTO_PHP_SLOT_STR from xen.xend.xenstore.xstransact import xstransact from xen.xend.server.BlktapController import blktap_disk_types from xen.xend.server.netif import randomMAC @@ -1235,7 +1235,8 @@ class XendConfig(dict): dpci_record = { 'VM': self['uuid'], 'PPCI': ppci_uuid, - 'hotplug_slot': pci_dev.get('vslot', 0) + 'hotplug_slot': pci_dev.get('vslot', + '0x' + AUTO_PHP_SLOT_STR) } dpci_opts = pci_dev.get('opts') diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py index 2f55e346fa..fb182ade5c 100644 --- a/tools/python/xen/xend/server/pciif.py +++ b/tools/python/xen/xend/server/pciif.py @@ -74,7 +74,8 @@ class PciController(DevController): bus = parse_hex(pci_config.get('bus', 0)) slot = parse_hex(pci_config.get('slot', 0)) func = parse_hex(pci_config.get('func', 0)) - vslot = parse_hex(pci_config.get('vslot', 0)) + vslot = parse_hex(pci_config.get('vslot', + '0x' + AUTO_PHP_SLOT_STR)) if pci_config.has_key('opts'): opts = serialise_pci_opts(pci_config['opts']) |