DPDK patches and discussions
 help / color / mirror / Atom feed
From: Neil Horman <nhorman@tuxdriver.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 04/15] pcap: Convert to use of PMD_REGISTER_DRIVER and fix linking
Date: Tue, 15 Apr 2014 14:05:58 -0400	[thread overview]
Message-ID: <1397585169-14537-5-git-send-email-nhorman@tuxdriver.com> (raw)
In-Reply-To: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com>

convert the pcap driver to use the PMD_REGISTER_DRIVER macro and fix up the
Makefile so that its linkage is only done if we are building static libraries.
This means that the test applications now have no reference to the pcap 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_pmd_pcap/rte_eth_pcap.c | 8 ++------
 mk/rte.app.mk                      | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c
index 680dfdc..4167a26 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -41,6 +41,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_vdev.h>
+#include <rte_pmd.h>
 
 #include <net/if.h>
 
@@ -772,9 +773,4 @@ static struct rte_vdev_driver pmd_pcap_drv = {
 	.init = rte_pmd_pcap_devinit,
 };
 
-__attribute__((constructor))
-static void
-rte_pmd_pcap_init(void)
-{
-	rte_eal_vdev_driver_register(&pmd_pcap_drv);
-}
+PMD_REGISTER_DRIVER(pmd_pcap_drv, PMD_VDEV);
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 5a0ef0c..e6d09b8 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -172,9 +172,11 @@ ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)
 LDLIBS += -lrte_cmdline
 endif
 
+ifeq ($(RTE_BUILD_SHARED_LIB),n)
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)
 LDLIBS += -lrte_pmd_pcap -lpcap
 endif
+endif
 
 LDLIBS += $(EXECENV_LDLIBS)
 
-- 
1.8.3.1

  parent reply	other threads:[~2014-04-15 18:06 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 ` Neil Horman [this message]
2014-04-15 18:05 ` [dpdk-dev] [PATCH 05/15] ring: Convert to use of PMD_REGISTER_DRIVER and fix linking 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   ` [dpdk-dev] [PATCH 0/X v5 12/14] virtio: " Neil Horman
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=1397585169-14537-5-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).