Move the ixgbe and ixgbevf pmds to use the PMD_INIT macro
Signed-off-by: Neil Horman <nhroman at tuxdriver.com>
---
examples/dpdk_qat/main.c | 4 ----
examples/vmdq_dcb/main.c | 2 +-
lib/librte_ether/rte_ethdev.c | 11 -----------
lib/librte_ether/rte_ethdev.h | 18 ------------------
lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 8 ++++++--
mk/rte.app.mk | 2 ++
6 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c
index 39f7df7..38c64c0 100644
--- a/examples/dpdk_qat/main.c
+++ b/examples/dpdk_qat/main.c
@@ -699,10 +699,6 @@ MAIN(int argc, char **argv)
/* init drivers */
if (rte_pmd_init_all() < 0)
rte_panic("PMD driver failed to init\n");
-#ifdef RTE_LIBRTE_IXGBE_PMD
- if (rte_ixgbe_pmd_init() < 0)
- rte_panic("Cannot init ixgbe pmd\n");
-#endif
if (rte_eal_pci_probe() < 0)
rte_panic("Cannot probe PCI\n");
diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 844f334..42fc1b2 100644
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -455,7 +455,7 @@ MAIN(int argc, char *argv[])
if (ret < 0)
rte_exit(EXIT_FAILURE, "Invalid VMDQ argument\n");
- if (rte_ixgbe_pmd_init() != 0 ||
+ if (rte_pmd_init_all() != 0) ||
rte_eal_pci_probe() != 0)
rte_exit(EXIT_FAILURE, "Error with NIC driver
initialization\n");
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 9a0a26a..3d87733 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -146,17 +146,6 @@ int rte_pmd_init_all(void)
int ret = -ENODEV;
struct pmd_entry *entry;
-#ifdef RTE_LIBRTE_IXGBE_PMD
- if ((ret = rte_ixgbe_pmd_init()) != 0) {
- RTE_LOG(ERR, PMD, "Cannot init ixgbe PMD\n");
- return (ret);
- }
- 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_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index d06308b..d9f4705 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1316,24 +1316,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
- * Ethernet devices.
- * Invoked once at EAL start time.
- * @return
- * 0 on success
- */
-extern int rte_ixgbe_pmd_init(void);
-
-/**
- * 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.
* Invoked once at EAL start time.
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index a5a7f9a..c6bfa71 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -58,6 +58,7 @@
#include <rte_ethdev.h>
#include <rte_atomic.h>
#include <rte_malloc.h>
+#include <rte_pmd.h>
#include "ixgbe_logs.h"
#include "ixgbe/ixgbe_api.h"
@@ -955,7 +956,7 @@ static struct eth_driver rte_ixgbevf_pmd = {
* Invoked once at EAL init time.
* Register itself as the [Poll Mode] Driver of PCI IXGBE devices.
*/
-int
+static int
rte_ixgbe_pmd_init(void)
{
PMD_INIT_FUNC_TRACE();
@@ -969,7 +970,7 @@ rte_ixgbe_pmd_init(void)
* Invoked one at EAL init time.
* Register itself as the [Virtual Poll Mode] Driver of PCI niantic devices.
*/
-int
+static int
rte_ixgbevf_pmd_init(void)
{
DEBUGFUNC("rte_ixgbevf_pmd_init");
@@ -3060,3 +3061,6 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t
rule_id)
return 0;
}
+
+PMD_INIT(rte_ixgbe_pmd_init);
+PMD_INIT(rte_ixgbevf_pmd_init);
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 7435d97..498b425 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -79,9 +79,11 @@ LDLIBS += -lrte_pmd_e1000
endif
endif
+ifeq ($(RTE_BUILD_SHARED_LIB),n)
ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
LDLIBS += -lrte_pmd_ixgbe
endif
+endif
ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)
LDLIBS += -lrte_pmd_virtio_uio
--
1.8.3.1
