Simon Horman
2009-Jul-14 06:27 UTC
[Xen-devel] [patch] 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@verge.net.au>
---
With this patch applied the current staging tree (19934:82c6d0b8852e)
passes my pass-through tests, which exercise both single and multi-function
pass-through.
Index: xen-unstable.hg/tools/python/xen/xm/main.py
==================================================================---
xen-unstable.hg.orig/tools/python/xen/xm/main.py 2009-07-14 15:49:22.000000000
+1000
+++ xen-unstable.hg/tools/python/xen/xm/main.py 2009-07-14 15:49:25.000000000
+1000
@@ -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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Masaki Kanno
2009-Jul-14 10:47 UTC
Re: [Xen-devel] [patch] pass-through: use vdevn in xm_pci_attach()
Hi Simon, Tue, 14 Jul 2009 16:27:37 +1000, Simon Horman wrote:>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@verge.net.au> > >--- > >With this patch applied the current staging tree (19934:82c6d0b8852e) >passes my pass-through tests, which exercise both single and multi-function >pass-through. > >Index: xen-unstable.hg/tools/python/xen/xm/main.py >==================================================================>--- xen-unstable.hg.orig/tools/python/xen/xm/main.py 2009-07-14 15:49:22. >000000000 +1000 >+++ xen-unstable.hg/tools/python/xen/xm/main.py 2009-07-14 15:49:25. >000000000 +1000 >@@ -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)))The above line includes tab indent. Best regards, Kan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Simon Horman
2009-Jul-14 23:21 UTC
Re: [Xen-devel] [patch] pass-through: use vdevn in xm_pci_attach()
On Tue, Jul 14, 2009 at 07:47:23PM +0900, Masaki Kanno wrote:> Hi Simon, > > Tue, 14 Jul 2009 16:27:37 +1000, Simon Horman wrote: > > >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@verge.net.au> > > > >--- > > > >With this patch applied the current staging tree (19934:82c6d0b8852e) > >passes my pass-through tests, which exercise both single and multi-function > >pass-through. > > > >Index: xen-unstable.hg/tools/python/xen/xm/main.py > >==================================================================> >--- xen-unstable.hg.orig/tools/python/xen/xm/main.py 2009-07-14 15:49:22. > >000000000 +1000 > >+++ xen-unstable.hg/tools/python/xen/xm/main.py 2009-07-14 15:49:25. > >000000000 +1000 > >@@ -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))) > > The above line includes tab indent.The dreaded tab! I''ll fix it and repost :-) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel