From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id AC894AFD6 for ; Tue, 15 Apr 2014 20:07:38 +0200 (CEST) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1Wa7lf-00031q-7h; Tue, 15 Apr 2014 14:07:38 -0400 From: Neil Horman To: dev@dpdk.org Date: Tue, 15 Apr 2014 14:06:08 -0400 Message-Id: <1397585169-14537-15-git-send-email-nhorman@tuxdriver.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com> References: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com> X-Spam-Score: -2.9 (--) X-Spam-Status: No Subject: [dpdk-dev] [PATCH 14/15] vmxnet3: Convert to use of PMD_REGISTER_DRIVER and fix linking X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 18:07:38 -0000 convert the vmxnet3 pmd driver to use the PMD_REGISTER_DRIVER macro. This means that the test applications now have no reference to the vmxnet3 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 --- lib/librte_ether/rte_ethdev.h | 19 +------------------ lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 13 +++++++++++-- mk/rte.app.mk | 8 ++++---- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 7126f95..24288f8 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1316,16 +1316,6 @@ struct eth_driver { extern void rte_eth_driver_register(struct eth_driver *eth_drv); /** - * The initialization function of the driver for VMware VMXNET3 - * Ethernet devices. - * Invoked once at EAL start time. - * @return - * 0 on success - */ -extern int rte_vmxnet3_pmd_init(void); - - -/** * The initialization function of *all* supported and enabled drivers. * Right now, the following PMDs are supported: * - igb @@ -1345,14 +1335,7 @@ extern int rte_vmxnet3_pmd_init(void); static inline int rte_pmd_init_all(void) { - int ret = -ENODEV; - -#ifdef RTE_LIBRTE_VMXNET3_PMD - if ((ret = rte_vmxnet3_pmd_init()) != 0) { - RTE_LOG(ERR, PMD, "Cannot init vmxnet3 PMD\n"); - return (ret); - } -#endif /* RTE_LIBRTE_VMXNET3_PMD */ + int ret = 0; if (ret == -ENODEV) RTE_LOG(ERR, PMD, "No PMD(s) are configured\n"); diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c index 8259cfe..19ac3eb 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c +++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c @@ -60,6 +60,8 @@ #include #include #include +#include +#include #include "vmxnet3/vmxnet3_defs.h" @@ -278,8 +280,8 @@ static struct eth_driver rte_vmxnet3_pmd = { * Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of Virtual PCI VMXNET3 devices. */ -int -rte_vmxnet3_pmd_init(void) +static int +rte_vmxnet3_pmd_init(const char *name __rte_unused, const char *param __rte_unused) { PMD_INIT_FUNC_TRACE(); @@ -763,3 +765,10 @@ vmxnet3_process_events(struct vmxnet3_hw *hw) } #endif + +static struct rte_driver rte_vmxnet3_driver = { + .type = PMD_PDEV, + .init = rte_vmxnet3_pmd_init, +}; + +PMD_REGISTER_DRIVER(rte_vmxnet3_driver); diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 827b8e3..afc45b2 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -73,10 +73,6 @@ LDLIBS += -lrte_ivshmem endif endif -ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y) -LDLIBS += -lrte_pmd_vmxnet3_uio -endif - ifeq ($(CONFIG_RTE_LIBRTE_TIMER),y) LDLIBS += -lrte_timer endif @@ -157,6 +153,10 @@ endif ifeq ($(RTE_BUILD_SHARED_LIB),n) +ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y) +LDLIBS += -lrte_pmd_vmxnet3_uio +endif + ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y) LDLIBS += -lrte_pmd_virtio_uio endif -- 1.8.3.1