igb_uio: don't bind vmxnet3 and virtio devices if disabled
authorDavid Marchand <david.marchand@6wind.com>
Wed, 5 Mar 2014 15:16:28 +0000 (16:16 +0100)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Fri, 21 Mar 2014 10:25:32 +0000 (11:25 +0100)
When not using vmxnet3-uio and virtio-uio PMDs, prevent igb_uio from binding
these devices. This way, vmxnet3 and virtio PMDs won't fail to initialize
because of a device silently bound to igb_uio.

Signed-off-by: David Marchand <david.marchand@6wind.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
lib/librte_eal/linuxapp/igb_uio/igb_uio.c

index 1c88aa8..209d61e 100644 (file)
@@ -79,8 +79,12 @@ static struct pci_device_id igbuio_pci_ids[] = {
 #define RTE_PCI_DEV_ID_DECL_IGBVF(vend, dev) {PCI_DEVICE(vend, dev)},
 #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {PCI_DEVICE(vend, dev)},
 #define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev) {PCI_DEVICE(vend, dev)},
+#ifdef RTE_LIBRTE_VIRTIO_PMD
 #define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev) {PCI_DEVICE(vend, dev)},
+#endif
+#ifdef RTE_LIBRTE_VMXNET3_PMD
 #define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) {PCI_DEVICE(vend, dev)},
+#endif
 #include <rte_pci_dev_ids.h>
 { 0, },
 };