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 02F1668BE for ; Thu, 10 Apr 2014 22:49:43 +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 1WYLwL-0004QX-LI; Thu, 10 Apr 2014 16:51:19 -0400 From: Neil Horman To: dev@dpdk.org Date: Thu, 10 Apr 2014 16:50:07 -0400 Message-Id: <1397163009-29950-17-git-send-email-nhorman@tuxdriver.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1397163009-29950-1-git-send-email-nhorman@tuxdriver.com> References: <1397162846-28912-1-git-send-email-nhorman@tuxdriver.com> <1397163009-29950-1-git-send-email-nhorman@tuxdriver.com> X-Spam-Score: -2.9 (--) X-Spam-Status: No Subject: [dpdk-dev] [PATCH 17/19] virtio: Move to using PMD_INIT macro 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: Thu, 10 Apr 2014 20:49:43 -0000 Move the virtio pmd to make use of the PMD_INIT macro Signed-off-by: Neil Horman --- lib/librte_ether/rte_ethdev.c | 7 ------- lib/librte_ether/rte_ethdev.h | 9 --------- lib/librte_pmd_virtio/virtio_ethdev.c | 6 +++++- mk/rte.app.mk | 3 ++- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 3d87733..8a3bbd1 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -146,13 +146,6 @@ int rte_pmd_init_all(void) int ret = -ENODEV; struct pmd_entry *entry; -#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_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index d9f4705..4c57864 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. diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c index f107161..f7366df 100644 --- a/lib/librte_pmd_virtio/virtio_ethdev.c +++ b/lib/librte_pmd_virtio/virtio_ethdev.c @@ -50,6 +50,7 @@ #include #include +#include #include "virtio_ethdev.h" #include "virtio_pci.h" @@ -486,7 +487,7 @@ static struct eth_driver rte_virtio_pmd = { * Register itself as the [Poll Mode] Driver of PCI virtio devices. * Returns 0 on success. */ -int +static int rte_virtio_pmd_init(void) { rte_eth_driver_register(&rte_virtio_pmd); @@ -643,3 +644,6 @@ 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; } + +PMD_INIT(rte_virtio_pmd_init); + diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 498b425..2aa71e4 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -83,11 +83,12 @@ 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 endif +endif + ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y) LDLIBS += -lrte_pmd_vmxnet3_uio -- 1.8.3.1