convert the virtio pmd driver to use the PMD_REGISTER_DRIVER macro.
This means that the test applications now have no reference to the virtio
library
when building DSO's and must specify its use on the command line with the -d
option. Static linking will still initalize the driver automatically.
Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
---
lib/librte_ether/rte_ethdev.h | 16 ----------------
lib/librte_pmd_virtio/virtio_ethdev.c | 12 ++++++++++--
mk/rte.app.mk | 8 ++++----
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index ba535dc..7126f95 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1316,15 +1316,6 @@ struct eth_driver {
extern void rte_eth_driver_register(struct eth_driver *eth_drv);
/**
- * The initialization function of the driver for Qumranet virtio-net
- * Ethernet devices.
- * Invoked once at EAL start time.
- * @return
- * 0 on success
- */
-extern int rte_virtio_pmd_init(void);
-
-/**
* The initialization function of the driver for VMware VMXNET3
* Ethernet devices.
* Invoked once at EAL start time.
@@ -1356,13 +1347,6 @@ int rte_pmd_init_all(void)
{
int ret = -ENODEV;
-#ifdef RTE_LIBRTE_VIRTIO_PMD
- if ((ret = rte_virtio_pmd_init()) != 0) {
- RTE_LOG(ERR, PMD, "Cannot init virtio PMD\n");
- return (ret);
- }
-#endif /* RTE_LIBRTE_VIRTIO_PMD */
-
#ifdef RTE_LIBRTE_VMXNET3_PMD
if ((ret = rte_vmxnet3_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init vmxnet3 PMD\n");
diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c
b/lib/librte_pmd_virtio/virtio_ethdev.c
index f107161..611393e 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -50,6 +50,7 @@
#include <rte_memory.h>
#include <rte_eal.h>
+#include <rte_dev.h>
#include "virtio_ethdev.h"
#include "virtio_pci.h"
@@ -486,8 +487,8 @@ static struct eth_driver rte_virtio_pmd = {
* Register itself as the [Poll Mode] Driver of PCI virtio devices.
* Returns 0 on success.
*/
-int
-rte_virtio_pmd_init(void)
+static int
+rte_virtio_pmd_init(const char *name __rte_unused, const char *param
__rte_unused)
{
rte_eth_driver_register(&rte_virtio_pmd);
return (0);
@@ -643,3 +644,10 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->max_rx_pktlen = VIRTIO_MAX_RX_PKTLEN;
dev_info->max_mac_addrs = VIRTIO_MAX_MAC_ADDRS;
}
+
+static struct rte_driver rte_virtio_driver = {
+ .type = PMD_PDEV,
+ .init = rte_virtio_pmd_init,
+};
+
+PMD_REGISTER_DRIVER(rte_virtio_driver);
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index d8f7907..3f1386b 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -73,10 +73,6 @@ LDLIBS += -lrte_ivshmem
endif
endif
-ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)
-LDLIBS += -lrte_pmd_virtio_uio
-endif
-
ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y)
LDLIBS += -lrte_pmd_vmxnet3_uio
endif
@@ -161,6 +157,10 @@ endif
ifeq ($(RTE_BUILD_SHARED_LIB),n)
+ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)
+LDLIBS += -lrte_pmd_virtio_uio
+endif
+
ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
LDLIBS += -lrte_pmd_ixgbe
endif
--
1.8.3.1
