[PATCH v7 08/10] virtio_pci: do not parse if interface is vfio
From: Santosh Shukla <hidden>
Date: 2016-01-27 17:39:56
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
If virtio interface attached to vfio driver then do not parse for virtio resource. Instead exit with return 0; Note: Applicable for virtio spec 0.95. Signed-off-by: Santosh Shukla <redacted> --- v5-->v6: - Replaced pci_dev->kdrv check from __noiommu to default; This is because patch [1] in v5 series not required. [1] http://dpdk.org/dev/patchwork/patch/9984/ v6--> v7: - Removed noiommu reference from commit message. drivers/net/virtio/virtio_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 0c29f1d..deec306 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c@@ -514,7 +514,9 @@ virtio_resource_init_by_ioports(struct rte_pci_device *pci_dev) static int legacy_virtio_resource_init(struct rte_pci_device *pci_dev) { - if (virtio_resource_init_by_uio(pci_dev) == 0) + if (pci_dev->kdrv == RTE_KDRV_VFIO) + return 0; + else if (virtio_resource_init_by_uio(pci_dev) == 0) return 0; else return virtio_resource_init_by_ioports(pci_dev);
--
1.7.9.5