[Xen-changelog] [xen-unstable] xend: pass-through: Use AUTO_PHP_SLOT as unknown vslot

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244108600 -3600
# Node ID 691087b8d4ac15f4e6d2a4e3dfce6feea596bdd9
# Parent  2c172f9db417b4111d92453a8eb84ecb8b8bd29e
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@xxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py   |    5 +++--
 tools/python/xen/xend/server/pciif.py |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff -r 2c172f9db417 -r 691087b8d4ac tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Jun 04 10:41:50 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Thu Jun 04 10:43:20 2009 +0100
@@ -31,7 +31,7 @@ from xen.xend.XendError import VmError
 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 -r 2c172f9db417 -r 691087b8d4ac tools/python/xen/xend/server/pciif.py
--- a/tools/python/xen/xend/server/pciif.py     Thu Jun 04 10:41:50 2009 +0100
+++ b/tools/python/xen/xend/server/pciif.py     Thu Jun 04 10:43:20 2009 +0100
@@ -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'])

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