From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <david.marchand@6wind.com>
Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49])
by dpdk.org (Postfix) with ESMTP id 617A037B2
for <dev@dpdk.org>; Wed, 20 Apr 2016 14:44:08 +0200 (CEST)
Received: by mail-wm0-f49.google.com with SMTP id l6so34671355wml.1
for <dev@dpdk.org>; Wed, 20 Apr 2016 05:44:08 -0700 (PDT)
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=2Qd4W2RSG+Jz0z4ewMLhpIZfesRquAGdRXeAvPNrznE=;
b=nG4Oo7BDBXtTU7X4IaxDjPeKnYPMl1Amqfqun+DSjh+SwG9c1d/pYQWCV00XQopK5Q
0uEWMt2vD/fuhoBEy67L7uh/M82QQg+X6uv+OHmEiBlxBWU0BGwJirjU3q7WsfWzhnUG
lf2dAgay/uiQwlmdpMDbuvcCCsAK4UclI0mCNWnLde+GM+LOtR+VHs4AxyvaRvCjGMOg
fgI5Od+WYqapY0oyYMUVxTH1Um0klN1r75EVCHAOEIzwt3KZg8IySRd9IXYzZVF3qdjP
QyAlGBdiqKuIDLf2HuiepjHno3nLn7Q5J1yncax+I6W4dBBiJ9GHUINUZYqhZxw3UjTC
ZUOA==
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=2Qd4W2RSG+Jz0z4ewMLhpIZfesRquAGdRXeAvPNrznE=;
b=X8B94/Wiij2TQRxNm3u1UIaoZeojNZcszEuA743w1Z1ia8T/Dc6WRqQ6jFnwddGFO1
4fu28359+9C736nCgWH8CVoZDHdj+tzF9u/YaPzKEVkAPfuNRpogPzCGrAADXRwnZrrn
RXCCR1P8/w1AgfGfVxf9sHYZ01/f6cau1rsfi+wAVwRBbhAzpqmv+W3OsmQlJD8SQS34
VmJuKYhdYEE1EQ8g3kAxf3zHIjD7LF4e1G8RUqPId3+faw4nM/Yy3fgCk6PEIIgAmleN
jQuJUltdOiBJXDUOduZVMAwxthZMxi9WLZk4nuM3pEssFWna3IlFMBvRwdiur6rfm5fV
9NwA==
X-Gm-Message-State: AOPr4FWG/rLKLJ2wLEZ9twyhxrkLsadZgD/XRjgHBGC4BQnMnBtourhXWDqZZpSLfyUDBGWD
X-Received: by 10.28.54.33 with SMTP id d33mr9679619wma.63.1461156248199;
Wed, 20 Apr 2016 05:44:08 -0700 (PDT)
Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net.
[78.126.77.144])
by smtp.gmail.com with ESMTPSA id j10sm5428135wjb.46.2016.04.20.05.44.07
(version=TLSv1/SSLv3 cipher=OTHER);
Wed, 20 Apr 2016 05:44:07 -0700 (PDT)
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Cc: thomas.monjalon@6wind.com, stephen@networkplumber.org,
bruce.richardson@intel.com, nhorman@tuxdriver.com, pmatilai@redhat.com,
christian.ehrhardt@canonical.com, Huawei Xie <huawei.xie@intel.com>,
Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Wed, 20 Apr 2016 14:43:48 +0200
Message-Id: <1461156236-25349-6-git-send-email-david.marchand@6wind.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1461156236-25349-1-git-send-email-david.marchand@6wind.com>
References: <1453120248-28274-1-git-send-email-david.marchand@6wind.com>
<1461156236-25349-1-git-send-email-david.marchand@6wind.com>
Subject: [dpdk-dev] [PATCH v3 05/13] 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 12:44:08 -0000
Reused defines from virtio_pci.h.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
drivers/net/virtio/virtio_ethdev.c | 7 ++-----
lib/librte_eal/common/include/rte_pci_dev_ids.h | 17 -----------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f8cc158..ee95cab 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -102,11 +102,8 @@ 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"
-
-{ .vendor_id = 0, /* sentinel */ },
+ { RTE_PCI_DEVICE(VIRTIO_PCI_VENDORID, VIRTIO_PCI_DEVICEID_MIN) },
+ { .vendor_id = 0, /* sentinel */ },
};
struct rte_virtio_xstats_name_off {
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
--
1.9.1