ixgbevf: convert to use of PMD_REGISTER_DRIVER and fix linking

Convert the ixgbevf pmd driver to use the PMD_REGISTER_DRIVER macro.
This means that the test applications now have no reference to the ixgbevf 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@tuxdriver.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 9621be7..ba535dc 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1315,15 +1315,6 @@ struct eth_driver {
  */
 extern void rte_eth_driver_register(struct eth_driver *eth_drv);
 
-/**
- * The initialization function of the driver for 10Gbps Intel IXGBE_VF
- * Ethernet devices.
- * Invoked once at EAL start time.
- * @return
- *   0 on success
- */
-extern int rte_ixgbevf_pmd_init(void);
-
 /**
  * The initialization function of the driver for Qumranet virtio-net
  * Ethernet devices.
@@ -1365,13 +1356,6 @@ int rte_pmd_init_all(void)
 {
        int ret = -ENODEV;
 
-#ifdef RTE_LIBRTE_IXGBE_PMD
-       if ((ret = rte_ixgbevf_pmd_init()) != 0) {
-               RTE_LOG(ERR, PMD, "Cannot init ixgbevf PMD\n");
-               return (ret);
-       }
-#endif /* RTE_LIBRTE_IXGBE_PMD */
-
 #ifdef RTE_LIBRTE_VIRTIO_PMD
        if ((ret = rte_virtio_pmd_init()) != 0) {
                RTE_LOG(ERR, PMD, "Cannot init virtio PMD\n");

diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index b7f629e..c9b5fe4 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -970,8 +970,8 @@ rte_ixgbe_pmd_init(const char *name __rte_unused, const char *params __rte_unuse
  * Invoked one at EAL init time.
  * Register itself as the [Virtual Poll Mode] Driver of PCI niantic devices.
  */
-int
-rte_ixgbevf_pmd_init(void)
+static int
+rte_ixgbevf_pmd_init(const char *name __rte_unused, const char *param __rte_unused)
 {
        DEBUGFUNC("rte_ixgbevf_pmd_init");
 
@@ -3067,4 +3067,10 @@ static struct rte_driver rte_ixgbe_driver = {
        .init = rte_ixgbe_pmd_init,
 };
 
+static struct rte_driver rte_ixgbevf_driver = {
+       .type = PMD_PDEV,
+       .init = rte_ixgbevf_pmd_init,
+};
+
 PMD_REGISTER_DRIVER(rte_ixgbe_driver);
+PMD_REGISTER_DRIVER(rte_ixgbevf_driver);

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 12876ed..d96475f 100644 (file)
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -73,10 +73,6 @@ LDLIBS += -lrte_ivshmem
 endif
 endif
 
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
-
 ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)
 LDLIBS += -lrte_pmd_virtio_uio
 endif
@@ -165,6 +161,10 @@ endif
 
 ifeq ($(RTE_BUILD_SHARED_LIB),n)
 
+ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
+LDLIBS += -lrte_pmd_ixgbe
+endif
+
 ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y)
 LDLIBS += -lrte_pmd_e1000
 endif