DPDK patches and discussions
 help / color / mirror / Atom feed
From: Neil Horman <nhorman@tuxdriver.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 0/X v5 12/14] virtio: Convert to use of PMD_REGISTER_DRIVER and fix linking
Date: Mon, 21 Apr 2014 10:59:37 -0400	[thread overview]
Message-ID: <1398092379-7679-13-git-send-email-nhorman@tuxdriver.com> (raw)
In-Reply-To: <1398092379-7679-1-git-send-email-nhorman@tuxdriver.com>

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@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

  parent reply	other threads:[~2014-04-21 15:00 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-15 18:05 [dpdk-dev] [PATCH 0/15] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
2014-04-15 18:05 ` [dpdk-dev] [PATCH 01/15] makefiles: Fixed -share command line option error Neil Horman
2014-04-16  9:22   ` Thomas Monjalon
2014-04-16 11:00     ` Neil Horman
2014-04-16 11:37       ` Thomas Monjalon
2014-04-16 13:51   ` [dpdk-dev] [PATCH 01/15 v2] " Neil Horman
2014-04-18 11:23     ` Thomas Monjalon
2014-04-18 13:18       ` Neil Horman
2014-04-18 13:29         ` Thomas Monjalon
2014-04-18 17:36           ` Neil Horman
2014-04-21 14:41           ` Neil Horman
2014-04-29 23:42     ` Thomas Monjalon
2014-05-02 11:09       ` Neil Horman
2014-05-02 12:22         ` Thomas Monjalon
2014-05-02 13:01           ` Neil Horman
2014-05-02 13:18             ` Thomas Monjalon
2014-04-15 18:05 ` [dpdk-dev] [PATCH 02/15] make: include whole archive on static link Neil Horman
2014-04-16  9:26   ` Thomas Monjalon
2014-04-16 11:02     ` Neil Horman
2014-04-16 11:40       ` Thomas Monjalon
2014-04-16 13:02         ` Neil Horman
2014-04-16 13:33           ` Neil Horman
2014-04-15 18:05 ` [dpdk-dev] [PATCH 03/15] pmd: Add PMD_REGISTER_DRIVER macro Neil Horman
2014-04-16 11:52   ` Thomas Monjalon
2014-04-16 12:59     ` John W. Linville
2014-04-16 13:08     ` Neil Horman
2014-04-16 16:11       ` Olivier MATZ
2014-04-16 17:15         ` John W. Linville
2014-04-16 17:29         ` Neil Horman
2014-04-17  8:08           ` Olivier MATZ
2014-04-17 10:59             ` Neil Horman
2014-04-18 11:42   ` Thomas Monjalon
2014-04-18 12:04     ` Neil Horman
2014-04-18 12:08       ` Thomas Monjalon
2014-04-18 13:20         ` Neil Horman
2014-04-18 13:32           ` Thomas Monjalon
2014-04-18 17:42             ` Neil Horman
2014-04-15 18:05 ` [dpdk-dev] [PATCH 04/15] pcap: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-15 18:05 ` [dpdk-dev] [PATCH 05/15] ring: " Neil Horman
2014-04-16 13:53   ` [dpdk-dev] [PATCH 05/15 v2] " Neil Horman
2014-04-17  9:50   ` [dpdk-dev] [PATCH 05/15] " Ananyev, Konstantin
2014-04-17 11:06     ` Neil Horman
2014-04-17 15:16     ` [dpdk-dev] [PATCH 05/15 v3] " Neil Horman
2014-06-13 13:28       ` De Lara Guarch, Pablo
2014-04-15 18:06 ` [dpdk-dev] [PATCH 06/15] xenvirt: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 07/15] eal: Make vdev init path generic for both virtual and physcial devices Neil Horman
2014-04-18 12:02   ` Thomas Monjalon
2014-04-15 18:06 ` [dpdk-dev] [PATCH 08/15] igb: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 09/15] igbvf: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 10/15] e1000: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 11/15] ixgbe: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 12/15] ixgbevf: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 13/15] virtio: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 14/15] vmxnet3: " Neil Horman
2014-04-15 18:06 ` [dpdk-dev] [PATCH 15/15] pmd: Remove rte_pmd_init_all Neil Horman
2014-04-21 14:59 ` [dpdk-dev] [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 01/14] makefiles: Fixed -share command line option error Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 02/14] pmd: Add PMD_REGISTER_DRIVER macro Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 03/14] pcap: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 04/14] ring: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 05/14] xenvirt: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 06/14] eal: Make vdev init path generic for both virtual and physcial devices Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 07/14] igb: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 08/14] igbvf: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 09/14] e1000: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 10/14] ixgbe: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 11/14] ixgbevf: " Neil Horman
2014-04-21 14:59   ` Neil Horman [this message]
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 13/14] vmxnet3: " Neil Horman
2014-04-21 14:59   ` [dpdk-dev] [PATCH 0/X v5 14/14] pmd: Remove rte_pmd_init_all Neil Horman
2014-04-21 17:05   ` [dpdk-dev] [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
2014-04-21 20:10   ` Stephen Hemminger
2014-04-21 20:36     ` Neil Horman
2014-05-16 15:28   ` Neil Horman
2014-05-16 15:39     ` Thomas Monjalon
2014-05-20 12:45   ` Thomas Monjalon
2014-05-20 14:13     ` Neil Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398092379-7679-13-git-send-email-nhorman@tuxdriver.com \
    --to=nhorman@tuxdriver.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).