dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
To: dev-VfR2kkLFssw@public.gmane.org
Subject: [PATCH 0/X v5 05/14] xenvirt: Convert to use of PMD_REGISTER_DRIVER and fix linking
Date: Mon, 21 Apr 2014 10:59:30 -0400	[thread overview]
Message-ID: <1398092379-7679-6-git-send-email-nhorman@tuxdriver.com> (raw)
In-Reply-To: <1398092379-7679-1-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>

convert the xenvirt driver to use the PMD_REGISTER_DRIVER macro.
This means that the test applications now have no reference to the xenvirt 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.

A few notes:

xenvirt was unbuildable as of commit 4c39baf297d10c217e7d3e7370f26a1fede58308..
That commit neglected to include the rte_vdev.h header, so several structs were
left undefined.  This patch includes a fix for that as well.

Also, The linkage for xenvirt is broken in much the same way pmd_ring was, in
that the xenvirt pmd has a function that is called directly from applications
(the example being the testpmd application).  The function is
rte_mempool_gntalloc_create, and should clearly be moved into the rte_mempool
library, with the supporting code in the function implementation moved to a new
xenvirt library separate from the pmd.  This is a large undertaking that
detracts from the purpose of this series however, and so for now, I'm leaving
the linkage to the application in place, and will address this issue in a later
series

Signed-off-by: Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
---
 lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 8 ++------
 mk/rte.app.mk                            | 7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
index 533aa76..ecafe7a 100644
--- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
+++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
@@ -53,6 +53,7 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
+#include <rte_vdev.h>
 #include <cmdline_parse.h>
 #include <cmdline_parse_etheraddr.h>
 
@@ -710,9 +711,4 @@ static struct rte_vdev_driver pmd_xenvirt_drv = {
 	.init = rte_pmd_xenvirt_devinit,
 };
 
-__attribute__((constructor))
-static void
-rte_pmd_xenvirt_init(void)
-{
-	rte_eal_vdev_driver_register(&pmd_xenvirt_drv);
-}
+PMD_REGISTER_DRIVER(pmd_xenvirt_drv, PMD_VDEV);
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 16edbce..aabe75e 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -158,16 +158,15 @@ ifeq ($(CONFIG_RTE_LIBRTE_EAL),y)
 LDLIBS += -lrte_eal
 endif
 
+ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)
+LDLIBS += -lrte_cmdline
+endif
 
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_XENVIRT),y)
 LDLIBS += -lrte_pmd_xenvirt
 LDLIBS += -lxenstore
 endif
 
-ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)
-LDLIBS += -lrte_cmdline
-endif
-
 ifeq ($(RTE_BUILD_SHARED_LIB),n)
 
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-- 
1.8.3.1

  parent reply	other threads:[~2014-04-21 14:59 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-15 18:05 [PATCH 0/15] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
     [not found] ` <1397585169-14537-1-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-15 18:05   ` [PATCH 01/15] makefiles: Fixed -share command line option error Neil Horman
     [not found]     ` <1397585169-14537-2-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-16  9:22       ` Thomas Monjalon
2014-04-16 11:00         ` Neil Horman
     [not found]           ` <20140416110018.GB26829-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-04-16 11:37             ` Thomas Monjalon
2014-04-16 13:51       ` [PATCH 01/15 v2] " Neil Horman
     [not found]         ` <1397656304-468-1-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-18 11:23           ` Thomas Monjalon
2014-04-18 13:18             ` Neil Horman
     [not found]               ` <20140418131849.GC4053-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
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
     [not found]               ` <20140502110927.GA15335-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-05-02 12:22                 ` Thomas Monjalon
2014-05-02 13:01                   ` Neil Horman
     [not found]                     ` <20140502130148.GD15335-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-05-02 13:18                       ` Thomas Monjalon
2014-04-15 18:05   ` [PATCH 02/15] make: include whole archive on static link Neil Horman
     [not found]     ` <1397585169-14537-3-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-16  9:26       ` Thomas Monjalon
2014-04-16 11:02         ` Neil Horman
     [not found]           ` <20140416110204.GC26829-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-04-16 11:40             ` Thomas Monjalon
2014-04-16 13:02               ` Neil Horman
     [not found]                 ` <20140416130204.GB11887-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-04-16 13:33                   ` Neil Horman
2014-04-15 18:05   ` [PATCH 03/15] pmd: Add PMD_REGISTER_DRIVER macro Neil Horman
     [not found]     ` <1397585169-14537-4-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-16 11:52       ` Thomas Monjalon
2014-04-16 12:59         ` John W. Linville
2014-04-16 13:08         ` Neil Horman
     [not found]           ` <20140416130848.GC11887-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-04-16 16:11             ` Olivier MATZ
     [not found]               ` <534EABB4.9020301-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-04-16 17:15                 ` John W. Linville
2014-04-16 17:29                 ` Neil Horman
     [not found]                   ` <20140416172924.GE11887-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-04-17  8:08                     ` Olivier MATZ
     [not found]                       ` <534F8BFD.6070701-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-04-17 10:59                         ` Neil Horman
2014-04-18 11:42       ` Thomas Monjalon
2014-04-18 12:04         ` Neil Horman
     [not found]           ` <20140418120409.GB2812-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-04-18 12:08             ` Thomas Monjalon
2014-04-18 13:20               ` Neil Horman
     [not found]                 ` <20140418132054.GD4053-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-04-18 13:32                   ` Thomas Monjalon
2014-04-18 17:42                     ` Neil Horman
2014-04-15 18:05   ` [PATCH 04/15] pcap: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-15 18:05   ` [PATCH 05/15] ring: " Neil Horman
     [not found]     ` <1397585169-14537-6-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-16 13:53       ` [PATCH 05/15 v2] " Neil Horman
2014-04-17  9:50       ` [PATCH 05/15] " Ananyev, Konstantin
     [not found]         ` <2601191342CEEE43887BDE71AB9772580EF973E4-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-04-17 11:06           ` Neil Horman
2014-04-17 15:16           ` [PATCH 05/15 v3] " Neil Horman
     [not found]             ` <1397747816-23245-1-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-06-13 13:28               ` De Lara Guarch, Pablo
2014-04-15 18:06   ` [PATCH 06/15] xenvirt: " Neil Horman
2014-04-15 18:06   ` [PATCH 07/15] eal: Make vdev init path generic for both virtual and physcial devices Neil Horman
     [not found]     ` <1397585169-14537-8-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-18 12:02       ` Thomas Monjalon
2014-04-15 18:06   ` [PATCH 08/15] igb: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-15 18:06   ` [PATCH 09/15] igbvf: " Neil Horman
2014-04-15 18:06   ` [PATCH 10/15] e1000: " Neil Horman
2014-04-15 18:06   ` [PATCH 11/15] ixgbe: " Neil Horman
2014-04-15 18:06   ` [PATCH 12/15] ixgbevf: " Neil Horman
2014-04-15 18:06   ` [PATCH 13/15] virtio: " Neil Horman
2014-04-15 18:06   ` [PATCH 14/15] vmxnet3: " Neil Horman
2014-04-15 18:06   ` [PATCH 15/15] pmd: Remove rte_pmd_init_all Neil Horman
2014-04-21 14:59   ` [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
     [not found]     ` <1398092379-7679-1-git-send-email-nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2014-04-21 14:59       ` [PATCH 0/X v5 01/14] makefiles: Fixed -share command line option error Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 02/14] pmd: Add PMD_REGISTER_DRIVER macro Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 03/14] pcap: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 04/14] ring: " Neil Horman
2014-04-21 14:59       ` Neil Horman [this message]
2014-04-21 14:59       ` [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       ` [PATCH 0/X v5 07/14] igb: Convert to use of PMD_REGISTER_DRIVER and fix linking Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 08/14] igbvf: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 09/14] e1000: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 10/14] ixgbe: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 11/14] ixgbevf: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 12/14] virtio: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 13/14] vmxnet3: " Neil Horman
2014-04-21 14:59       ` [PATCH 0/X v5 14/14] pmd: Remove rte_pmd_init_all Neil Horman
2014-04-21 17:05       ` [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's Neil Horman
2014-04-21 20:10       ` Stephen Hemminger
     [not found]         ` <20140421131000.743b6d9b-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2014-04-21 20:36           ` Neil Horman
2014-05-16 15:28       ` Neil Horman
     [not found]         ` <20140516152847.GB5432-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
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-6-git-send-email-nhorman@tuxdriver.com \
    --to=nhorman-2xusbdqka4r54taoqtywwq@public.gmane.org \
    --cc=dev-VfR2kkLFssw@public.gmane.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).