From: David Marchand Date: Wed, 5 Mar 2014 15:16:28 +0000 (+0100) Subject: igb_uio: don't bind vmxnet3 and virtio devices if disabled X-Git-Tag: spdx-start~10912 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=a6bb9c8ced31b8873c29ee827046a210f5afeb70;p=dpdk.git igb_uio: don't bind vmxnet3 and virtio devices if disabled 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 Acked-by: Thomas Monjalon --- diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 1c88aa867a..209d61ea31 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -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 { 0, }, };