From patchwork Sun Jan 10 12:50:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 9787 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A24C78E7E; Sun, 10 Jan 2016 13:51:13 +0100 (CET) Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 1C3B78D93 for ; Sun, 10 Jan 2016 13:51:11 +0100 (CET) Received: by mail-wm0-f47.google.com with SMTP id u188so185043535wmu.1 for ; Sun, 10 Jan 2016 04:51:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J4XZ9mSPholEl1zsunAHicuSaTKDWefaYEvM+EVHcjI=; b=BFOw2RqSrxhBiRMT0zAosT0davo1lQ4ZnkYkDJWmj3IaNo6vZY2dmyGR3syeS1gmtm 2CHNBJbcHHOmBhg/YYGTzYHPmeuUgDnNdl1RHa2uuF/L+x/QXHOW2jA184xf6zGWp/Ws n9XXcXtzHs3QRXxCK31sWfxRLWxFlr44I1KILP3Nx9TZgt2mOR9uiyWx/i8WHAde2dbt OeMfOIJs6+/ogggl5BSuW8j7PNt+i9cDLchcbIbgp6qsNyfsl24WfSH2XwJsF5bvpFnB fDNFfz6xNrtuMYzgvu2eS3gQ5Q8DYWaqNYUVEEeei6XInHho1EPDPonmyKkO36dMgUdu cz3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J4XZ9mSPholEl1zsunAHicuSaTKDWefaYEvM+EVHcjI=; b=QrNUsZmnACQvaNMFr4rJ6Nl3YS2x2wHUYHLcKRHvz5Xv0K6gGckxvMUtw72kf6zXPq HOuSBmT7sNquG2rcKhEBQpbY3et5AVztxaJ21MjZWXxID6WLS4lw+gwrvrkmwWN4UXOI z68WOJ3fDtPQqMCnKwcqRuisWPvzF1aeGEFlWIxyNXbwqfQ9zvBrC/DqzYe23+FkA0Vm B1Au1/gddVZPtO6D/SFbZ2A840stjbxuKTpl0zDYT1AFiDjGiDEIpgIuK0CAD1uC670F 6FO26Lo+/1JMOnJPfr78vjqvbPQdsg+D4T7+4ywg3EuRgpdIMPkQnJS2AAxbb5JmahBg n6KQ== X-Gm-Message-State: ALoCoQm+Cev4ArEFbysU+3LiI9ffHGCor3PQYVxCos+lenOig+l4eRnkhI4QVOJPN1tO3/OC4F0vWUg2ILhN0oQ0fnLudEYasw== X-Received: by 10.28.221.85 with SMTP id u82mr8638602wmg.95.1452430270888; Sun, 10 Jan 2016 04:51:10 -0800 (PST) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id u12sm8088011wmu.10.2016.01.10.04.51.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jan 2016 04:51:10 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Sun, 10 Jan 2016 13:50:48 +0100 Message-Id: <1452430254-30390-6-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> Cc: thomas.monjalon@dpdk.org Subject: [dpdk-dev] [PATCH 05/11] virtio: move pci device ids to driver 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reused defines from virtio_pci.h. Signed-off-by: David Marchand --- drivers/net/virtio/virtio_ethdev.c | 5 +---- lib/librte_eal/common/include/rte_pci_dev_ids.h | 17 ----------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d928339..e9af0d7 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -106,10 +106,7 @@ static int virtio_dev_queue_stats_mapping_set( * The set of PCI devices this driver supports */ static const struct rte_pci_id pci_id_virtio_map[] = { - -#define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, -#include "rte_pci_dev_ids.h" - +{ RTE_PCI_DEVICE(VIRTIO_PCI_VENDORID, VIRTIO_PCI_DEVICEID_MIN) }, { .vendor_id = 0, /* sentinel */ }, }; diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h index a19fdfa..448b5e1 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -68,7 +68,6 @@ * driver which is a para virtualization driver running in guest virtual machine. * The inclusion of these in an array built using this file depends on the * definition of - * RTE_PCI_DEV_ID_DECL_VIRTIO * at the time when this file is included. * * In order to populate an array, the user of this file must define this macro: @@ -89,10 +88,6 @@ * Note that this file can be included multiple times within the same file. */ -#ifndef RTE_PCI_DEV_ID_DECL_VIRTIO -#define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_VMXNET3 #define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) #endif @@ -109,11 +104,6 @@ #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) #endif -#ifndef PCI_VENDOR_ID_QUMRANET -/** Vendor ID used by virtio devices */ -#define PCI_VENDOR_ID_QUMRANET 0x1AF4 -#endif - #ifndef PCI_VENDOR_ID_VMWARE /** Vendor ID used by VMware devices */ #define PCI_VENDOR_ID_VMWARE 0x15AD @@ -129,12 +119,6 @@ #define PCI_VENDOR_ID_BROADCOM 0x14E4 #endif -/****************** Virtio devices from virtio.h ******************/ - -#define QUMRANET_DEV_ID_VIRTIO 0x1000 - -RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, QUMRANET_DEV_ID_VIRTIO) - /****************** VMware VMXNET3 devices ******************/ #define VMWARE_DEV_ID_VMXNET3 0x07B0 @@ -199,5 +183,4 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF) */ #undef RTE_PCI_DEV_ID_DECL_BNX2X #undef RTE_PCI_DEV_ID_DECL_BNX2XVF -#undef RTE_PCI_DEV_ID_DECL_VIRTIO #undef RTE_PCI_DEV_ID_DECL_VMXNET3