[Xen-changelog] [xen-unstable] pass-through: use vdevn in xm_pci_attach()

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1247578736 -3600
# Node ID 4afd6669a351d14a623f37bb3fd525bf2705e09a
# Parent  42795382cb93ecd5310584d9d8a89c057836e186
pass-through: use vdevn in xm_pci_attach()

Use vdevfn in xm_pci_attach() for non-zero functions,
the vslot element of dev dictionaries no longer exists.

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 tools/python/xen/xm/main.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 42795382cb93 -r 4afd6669a351 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Tue Jul 14 14:37:53 2009 +0100
+++ b/tools/python/xen/xm/main.py       Tue Jul 14 14:38:56 2009 +0100
@@ -2555,13 +2555,13 @@ def xm_pci_attach(args):
 
     # If the slot wasn't spefified in the args then use the slot
     # assigned to the head by qemu-xen for the rest of the functions
-    if int(head_dev['vslot'], 16) & AUTO_PHP_SLOT:
+    if int(head_dev['vdevfn'], 16) & AUTO_PHP_SLOT:
         vdevfn = int(find_attached_devfn(attached_pci_dict(dom), head_dev), 16)
         if not vdevfn & AUTO_PHP_SLOT:
             vslot = PCI_SLOT(vdevfn)
             for i in dev:
-                i['vslot'] = '0x%02x' % \
-                            PCI_DEVFN(vslot, PCI_FUNC(int(i['vslot'], 16)))
+                i['vdevfn'] = '0x%02x' % \
+                            PCI_DEVFN(vslot, PCI_FUNC(int(i['vdevfn'], 16)))
 
     for i in dev:
         xm_pci_attach_one(dom, i)

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