From patchwork Sat Oct 8 18:05:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 16454 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 63628590F; Sat, 8 Oct 2016 20:04:26 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0078.outbound.protection.outlook.com [104.47.38.78]) by dpdk.org (Postfix) with ESMTP id 485AD590B for ; Sat, 8 Oct 2016 20:04:25 +0200 (CEST) Received: from BN6PR03CA0055.namprd03.prod.outlook.com (10.173.137.17) by SN1PR0301MB2016.namprd03.prod.outlook.com (10.163.226.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Sat, 8 Oct 2016 18:04:23 +0000 Received: from BY2FFO11FD022.protection.gbl (2a01:111:f400:7c0c::196) by BN6PR03CA0055.outlook.office365.com (2603:10b6:404:4c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16 via Frontend Transport; Sat, 8 Oct 2016 18:04:21 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD022.mail.protection.outlook.com (10.1.15.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Sat, 8 Oct 2016 18:04:21 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u98I4H81017085; Sat, 8 Oct 2016 11:04:18 -0700 From: Shreyansh Jain To: CC: , , , Shreyansh Jain Date: Sat, 8 Oct 2016 23:35:11 +0530 Message-ID: <1475949911-27300-1-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475949668-26829-1-git-send-email-shreyansh.jain@nxp.com> References: <1475949668-26829-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131204234614403609; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5003940100001)(11100500001)(47776003)(68736007)(81166006)(5890100001)(81156014)(4326007)(50986999)(76176999)(586003)(50466002)(92566002)(8676002)(48376002)(189998001)(77096005)(104016004)(19580405001)(33646002)(105606002)(575784001)(626004)(36756003)(86362001)(8936002)(19580395003)(229853001)(305945005)(106466001)(87936001)(97736004)(5660300001)(356003)(2351001)(110136003)(8666005)(6916009)(6666003)(2906002)(7846002)(2950100002)(85426001)(50226002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2016; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD022; 1:arPEdDAkEKF81rxO7R84x3LL7aQ0MT18Dt3gY/kcsuoGaAuwwivB65GyCVIT95MSvCIsxEh7yenarWy/Z1PKyPrQrZZZYvirSuf8P+T/Z5hKOE/LoGAYwikc2kWGo8JjtmjcueCicrkfRfkdbg5NcWB64pkS0cqUGNw3eVDkSEhdpfMsJdWJE5GYfvktY2GF8FJOSZWPKoVFxb7xqIB7FzsG055utTu7WTNQB8vTfuVMKgwmrF5LKXTz2I7WeBm1He551g7LzeFnq8NIbYPeQHq1lE1jGCVTQC8IDQVocnnjO6yfrt/zkoprkQ9f/LUBgUWEfjovK852S2d6mj4R+YwY+Xtua/eR+81vtBP94OUr5qW/mypK3tzVq67LNhIGimSNRCCLCEUX17x0e/WXiMr65LT3O0VJVWiaP7MRM6C4tpX3xoV42tg9W5n56/DiTn//Tc8EVxg/xsgSPnWzQRFeLk1vrb4ia6MvVObd1Q6yhhKbZvutZudkzaUW699eVprHVQwkWmwU9+h4StueM2DuEEvF57uJ2NqXamKYtz4Hpv2F26LQ2ssrgPsh2Pg0PHu6AM4aiOo64An1VrQDVlDrBHYle8hjXOL9Th1R9L+hrmBpla63uip53SRSghy7adt4JqIvlJfc+GZRCuUDe1FfjvM0umQFf4oIdT6M1eXlLIiJopz9sErBpmYA0iiPa/gFyU9aDLsoBYSCGN97Awy7doKr/asL8YDvUllWRbs= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3b54744c-87c8-4b6d-e711-08d3efa5879b X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2016; 2:Rb/OQak5cE8fZB1DHWbgca6ryxd8xGmk/clYZd7RO+83/GeGPzLSwMY+Ax0sRkm18LhPcy/MFjWzFQnJulBUq7Ad56/1isKVs+mm2gvmew9/fPDDBxIo7ZpQ9BjxopXfzfYmXNGUcmUfI73kzac4XZnrfu+eGxo/l57iwhomJOKtCJ8kqCLYHGsBWUmJn8TmrOr2tXIpy1tgxR8gnbDjUA==; 3:G3roLCQNa5zYF+COY813cQPUfnXl1sq/+0Ki6tQduZ9A3CHY4ZRR+vpoTVvEPBXcNp9rCgj16sawf5sZY23M4gAKFo2UBIC/nyVqJVdCLlf8GKXu+ylzvTtyJ0FnP2BmSqeNJjW1K7lXpyS1pOnz5fcUJwWkxW0kOZTOia6UVncl5J7LX+CG8CV3Ca25xgdGtOZhmSKysgHGhduIq39ekpy8G77rr8FTNKDmH/8+X8uumu1yd0GGSlZqtBHm/4qn; 25:5mRxw3313wTzTgP89bsPklyJHzYPoeefYM5nKwliNmAAfAyqgWLJaMsLkNHmgCftwk3Lbnb9wN02PG3mEvUIQEy1hAnI2o9kbbgkw+CJaK/AEx9yg+R6dDrqi2i6x47O3gGvIlW2jL+/K2eIvPbsF/ankh6H0OVke0Hb4gBVWmFdC2gM44blPUuJqT3+rAGulO9gwPVqifzVvIkz9ZEFzjyQj66fUWT3vfNk1hOkouNqYqIuRFXxmm/air7xEUrNF+KhKoMHycUrdqSmRSCVjQ2XxA5Sjyt4oLMh8R8LZIG/6fOw84IXrYiaH6S6lXD1jZlUM3MTsGB07le9TKsT2nCmTkEGINWnIcgL+aUkaMM0Mtojc6Zn5HodePx3Ojdxr5JIY2Q0+nROouBawexy+M2p65tQS5bgS7MAmVzrX0gMqCZ870jZen03CmIXB4Kx X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2016; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2016; 31:Ta0NQrXnPddcMGRG4hsTjSc/NXaIc+Q06EXyGOB6wZsa/FSr+5n1Trx277OJgPblNtFr6WfEE7A3kZaxX0saEE44/oKCAygfhkCcMmcO/I6zS26iQriVSp1F/zMgNXgefZ3ehj6T8zBxGIGS8UhIq/VXXTGSipcEGLB/tWJ/myHvXjOMTfVvgGhol5rFe3Ojs8Ki64kyBzbrO2+p/wkzV+1cGk6IDFSoPM1wqVvXXLUl+gTDVxjY7WYyoWbP+nnxg5naY1XwIViOJ3tfn1GI1w==; 4:sGk56pfHWCjLdt+A06lB+SD4o9/6MRjALzX8rWfNbA2HNs6kQKlXGa6aixq3aAn5aSIyeUdz+Mwo9FqKsCBtJGo5QNJUbpX6cXI2V61GdgbMllLrKzO278EkyM8u+9+qc+wIF43FrHXl6Yz8VnQxLi70RG7eNIpLfhJORFxJtpu8Yj+IqoRaTKeFFUkm9Sh6V7uVPZ6J3bvalD12c108dstFXyoB4T688XVvJ5/rhwQXaltlIJZ383/HMVFjhuyVCMQOdfuopldA1zv3tLotdyEmtCwrKgmkClmff0Abmn3GietlhI+Z209rwmVV19bqXwkKb5bB8WWnUvTjVw4Ylshjuw1kiesb6x42i5rktPiJV2ccDL4GPmfwVZuSMgz2/gMfIWTEyOgk+zv6izJoS6aseiVAGDzMGx52QlHcNNLCLgHS7Ug/bLX9Ejn9pCy2fTYNODX23zVpJejQo8K/78zzVLoaFbn9Qc/dIERBdbECAwrWIp0t3FFGhp1b6G5PXk2St9LI8y3LcVWERZGJrYpB5OTWB9zMOwmtQi/lj2NUBPM65aRv+gzkDX7Z8/Vn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13017025)(13023025)(13015025)(13018025)(8121501046)(13024025)(5005006)(3002001)(10201501046)(6055026); SRVR:SN1PR0301MB2016; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2016; X-Forefront-PRVS: 008960E8EC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2016; 23:O6X2CDhLVyK4iaVv2WKsyE78tdDw4nfrMp2jMZd?= =?us-ascii?Q?aSYpa3xmALJ5axmTa0IJDzJm3br6nQ8Uflf9W16bmjDXZAHiqgYRbflaPVaE?= =?us-ascii?Q?M3T0zlJH+Tg8ZQE6EBudBUUw2un0I2BVQP/kjOe4wGz7gzEGn+AG2lzoOXuR?= =?us-ascii?Q?ynRhH5MrWtbHL/nwOKQo/aF+/uQBOuvCH+UB7xtn1tECo5zIe8QNVko43xKn?= =?us-ascii?Q?9RzcVqx0cHq6CV298z18oJ8CDCn/owGq+WJuFj+/8tCp0pb1OoEUZH0UPpFJ?= =?us-ascii?Q?8VKB9Nvn4yWho9510SDNQRwhVCrMFRxk3XgbZ3fG+djzzOmdFkgTgnp0tPXK?= =?us-ascii?Q?iIOLCt/ZK3zkzPMM1b2teEExyUi1G7Y2ytWRKnb1bSZR+4yjD+sDBt/iOR2d?= =?us-ascii?Q?7Yi3Gnz1blUq5YmzmnV4Iyq1OZ1nXUiWqd62BNAAGkvWQ2eDCUl4Mm78HI4Z?= =?us-ascii?Q?RoIlDp3fXmHnzcIGkHVvZtoTuCc8fBZjqsQTFMvq1TtKc2a07GWQyL19Lokg?= =?us-ascii?Q?QJC0aM8RIehIYKZ5y6ItlX1bi48JtC0RdMM+w5NSNrqJ6/2K16nfSPrEq3SD?= =?us-ascii?Q?mIdQHe4IH1tA0bPL5NTwzmKRNzkseQehyTYEnFaJ5cs1DM3t1ok45R/qPztB?= =?us-ascii?Q?yGfHhrr4gvF0KAYuLm4UGhC2qXrVJf4nu9TId0vo8A7P755qKK+73uXPHcAH?= =?us-ascii?Q?IxA0AYyMPelRdTevxArydHTLkBvb/+GGbyEs4AZUQEfnQl4hUM+3CuvOUtIn?= =?us-ascii?Q?vOfoGQ28JQmMxoDqTGzJq6a3nonZ1LmjtHGeeCRaz2fxCi/u2M4U+qlDAdDE?= =?us-ascii?Q?JpyXCJgOKFE9T2WK4oi2wP96d45YBjb09+FSNit4wkvo/migIjIbhMksrjPI?= =?us-ascii?Q?ewcdAauidNzhE2U2DrVRsTNJRxfnEm1aAew+z6ybu10dbtZzmFuoCGf9QYSh?= =?us-ascii?Q?AQsYFEwbkVh8b/OMn2J3W+qKTwRqzgwORN/+gK+ZbJTPx1yBZYZqKoNvygYF?= =?us-ascii?Q?rI6Zmj8r4w8I3Dvwss5CUcVC9pfgvunv97VdXWdcBEU0be80BSQVwWHnryFr?= =?us-ascii?Q?WUIaWKpP9m/JGhhU27A3uX1KT/A1jU5wfVL6z2FeuZCl58E4Ho2RLDYWZ6Zx?= =?us-ascii?Q?iFtTdr+KWlsguJv8BTwE1Lfn3G6Ei7aZ588mgp+1AHResYofNmFog2jn87HH?= =?us-ascii?Q?G28A1rHmSLXyo1UgJk7SwD/szjx2Ly6VURHaJPRp7Y1FaeJeZ4SwF6pzdWD6?= =?us-ascii?Q?UA1m38maeWY8vxZOoTF7YvkRdXtP5dauydgOmOURT?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2016; 6:BBuu5VziAc5DBW1eB1DDjFIzBKnWCzhNzUMgTB9OWTjoXxCMdNmPQbtEvH1VxvGCyLuQhFb9sm4QxqMSZcgVulJro6Z8H/TL5V3mayQ1s3PL1eRt8WVvkusVPoHdkooQ/o3hacy7+fZvkC/Pr78YnUfj5wbUdOHQWOhuQ5590P21vZrK43msoGmHYGOSf6gQ9Xz68JraGoIgejHg2jhRH666fc/g3VkooFhcPqWdWa/zmYk58Jy+E8VZAxYo0Q63G3AGJYWvbijnubQBUlzJMLOWB0Lgep/DaCg7ar57MJDyHNWKRy5tT5Noe4rYvAxt; 5:0MS0bVzm4Snh9VhRErCVmXIvNhFQLugRBysR3DJRqh5aBhOoJ0DDXxAuSZfOovdXkfbLLic6kPy+QlRnBT2fpPkCpTTUSxIblWHkMtmj82k3SlnqOle/+Ylp/pVVznQVd+cnqLtndA2gXwWsYKzeK/m3iXXDlsmpykrRvIgnNPYUcxEmQrUS+M0hbW+/TbLD; 24:iZq5MaiLtd7R6GeEiggwlsiVy4izATQvPFC0VqKQTa00nE5ZPoB6EjUEc4gZVxEexx9jgiyB+1b6a0AInhyFxJMyVf5kUlGCw4qAyGDIS4Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2016; 7:l1DFQSjmaVh07dOc/hyzuhXWodZ7eDLFlDv8RueF9WaQiMjz1n96W5DknikahSj2KfljOEsT2x1T2FDOJZfS1RP4jpLlq441+UMdforGica9mZQO85S0xznlZP40CzDS19SAzJ69+AGjUN+VAfjI964cVtICMln64ifzFEOM8hM6dFuAxIw0+szQKlqdyUNje9mE4KkCicaiyBh+s3f/kXI1C7vCh6Ef+Cy+/pyCLmFXPYh1eIky4GV9q18sTkAmctQ6J1q5C/lIshiGE+mROUajMsqS5HDXTOFZWLwAicq1Fbjfybr9nr7usOyfvJ8dGL+H8vrmcqaV5P83Ee9TWQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2016 18:04:21.1283 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB2016 Subject: [dpdk-dev] [PATCH v2] drivers: prefix driver REGISTER macro with RTE PMD 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" All macros related to driver registeration renamed from DRIVER_* to RTE_PMD_* This includes: DRIVER_REGISTER_PCI -> RTE_PMD_REGISTER_PCI DRIVER_REGISTER_PCI_TABLE -> RTE_PMD_REGISTER_PCI_TABLE DRIVER_REGISTER_VDEV -> RTE_PMD_REGISTER_VDEV DRIVER_REGISTER_PARAM_STRING -> RTE_PMD_REGISTER_PARAM_STRING DRIVER_EXPORT_* -> RTE_PMD_EXPORT_* Fix PMDINFOGEN tool to look for exact matches of RTE_PMD_REGISTER_PCI and RTE_PMD_REGISTER_VDEV. Signed-off-by: Shreyansh Jain --- Changes since v1: - Fix patch headline Changes since v0: - expand replacement to DRIVER_EXPORT_* - merge all changes into single commit - checkpatch fixes --- doc/guides/prog_guide/dev_kit_build_system.rst | 2 +- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 4 ++-- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 4 ++-- drivers/crypto/kasumi/rte_kasumi_pmd.c | 4 ++-- drivers/crypto/libcrypto/rte_libcrypto_pmd.c | 5 +++-- drivers/crypto/null/null_crypto_pmd.c | 4 ++-- drivers/crypto/qat/rte_qat_cryptodev.c | 4 ++-- drivers/crypto/snow3g/rte_snow3g_pmd.c | 4 ++-- drivers/crypto/zuc/rte_zuc_pmd.c | 4 ++-- drivers/net/af_packet/rte_eth_af_packet.c | 4 ++-- drivers/net/bnx2x/bnx2x_ethdev.c | 8 ++++---- drivers/net/bnxt/bnxt_ethdev.c | 4 ++-- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- drivers/net/cxgbe/cxgbe_ethdev.c | 4 ++-- drivers/net/e1000/em_ethdev.c | 4 ++-- drivers/net/e1000/igb_ethdev.c | 8 ++++---- drivers/net/ena/ena_ethdev.c | 4 ++-- drivers/net/enic/enic_ethdev.c | 4 ++-- drivers/net/fm10k/fm10k_ethdev.c | 4 ++-- drivers/net/i40e/i40e_ethdev.c | 4 ++-- drivers/net/i40e/i40e_ethdev_vf.c | 4 ++-- drivers/net/ixgbe/ixgbe_ethdev.c | 8 ++++---- drivers/net/mlx4/mlx4.c | 4 ++-- drivers/net/mlx5/mlx5.c | 4 ++-- drivers/net/mpipe/mpipe_tilegx.c | 4 ++-- drivers/net/nfp/nfp_net.c | 4 ++-- drivers/net/null/rte_eth_null.c | 4 ++-- drivers/net/pcap/rte_eth_pcap.c | 4 ++-- drivers/net/qede/qede_ethdev.c | 8 ++++---- drivers/net/ring/rte_eth_ring.c | 4 ++-- drivers/net/szedata2/rte_eth_szedata2.c | 4 ++-- drivers/net/thunderx/nicvf_ethdev.c | 4 ++-- drivers/net/vhost/rte_eth_vhost.c | 4 ++-- drivers/net/virtio/virtio_ethdev.c | 4 ++-- drivers/net/virtio/virtio_user_ethdev.c | 4 ++-- drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++-- drivers/net/xenvirt/rte_eth_xenvirt.c | 4 ++-- lib/librte_eal/common/eal_common_dev.c | 2 +- lib/librte_eal/common/include/rte_dev.h | 10 +++++----- lib/librte_eal/common/include/rte_pci.h | 4 ++-- lib/librte_eal/common/include/rte_vdev.h | 4 ++-- mk/internal/rte.compile-pre.mk | 3 ++- 42 files changed, 94 insertions(+), 92 deletions(-) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 05358d0..19de156 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -264,7 +264,7 @@ instance the macro: .. code-block:: c - DRIVER_REGISTER_PCI(name, drv) + RTE_PMD_REGISTER_PCI(name, drv) Creates the following symbol: diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index 76dce9c..0b3fd09 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -528,8 +528,8 @@ static struct rte_vdev_driver aesni_gcm_pmd_drv = { .remove = aesni_gcm_remove }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD, aesni_gcm_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD, aesni_gcm_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index ff2fc25..b936735 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -719,8 +719,8 @@ static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = { .remove = cryptodev_aesni_mb_remove }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD, cryptodev_aesni_mb_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD, cryptodev_aesni_mb_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index 03e7272..11bbf80 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -655,8 +655,8 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = { .remove = cryptodev_kasumi_remove }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/libcrypto/rte_libcrypto_pmd.c b/drivers/crypto/libcrypto/rte_libcrypto_pmd.c index 535fb57..e991c57 100644 --- a/drivers/crypto/libcrypto/rte_libcrypto_pmd.c +++ b/drivers/crypto/libcrypto/rte_libcrypto_pmd.c @@ -1054,8 +1054,9 @@ static struct rte_vdev_driver cryptodev_libcrypto_pmd_drv = { .remove = cryptodev_libcrypto_uninit }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_LIBCRYPTO_PMD, cryptodev_libcrypto_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_LIBCRYPTO_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_LIBCRYPTO_PMD, + cryptodev_libcrypto_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_LIBCRYPTO_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index e41e819..a7d3600 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -273,8 +273,8 @@ static struct rte_vdev_driver cryptodev_null_pmd_drv = { .remove = cryptodev_null_remove }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/qat/rte_qat_cryptodev.c b/drivers/crypto/qat/rte_qat_cryptodev.c index 4846b30..1e7ee61 100644 --- a/drivers/crypto/qat/rte_qat_cryptodev.c +++ b/drivers/crypto/qat/rte_qat_cryptodev.c @@ -129,6 +129,6 @@ static struct rte_cryptodev_driver rte_qat_pmd = { .dev_private_size = sizeof(struct qat_pmd_private), }; -DRIVER_REGISTER_PCI(CRYPTODEV_NAME_QAT_SYM_PMD, rte_qat_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(CRYPTODEV_NAME_QAT_SYM_PMD, pci_id_qat_map); +RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_QAT_SYM_PMD, rte_qat_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(CRYPTODEV_NAME_QAT_SYM_PMD, pci_id_qat_map); diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 60d8969..a794251 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -643,8 +643,8 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = { .remove = cryptodev_snow3g_remove }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c index 457f3ca..f46a16c 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd.c +++ b/drivers/crypto/zuc/rte_zuc_pmd.c @@ -543,8 +543,8 @@ static struct rte_vdev_driver cryptodev_zuc_pmd_drv = { .remove = cryptodev_zuc_uninit }; -DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_ZUC_PMD, cryptodev_zuc_pmd_drv); -DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ZUC_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ZUC_PMD, cryptodev_zuc_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ZUC_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 6777c41..201c1be 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -894,8 +894,8 @@ static struct rte_vdev_driver pmd_af_packet_drv = { .remove = rte_pmd_af_packet_remove, }; -DRIVER_REGISTER_VDEV(net_af_packet, pmd_af_packet_drv); -DRIVER_REGISTER_PARAM_STRING(net_af_packet, +RTE_PMD_REGISTER_VDEV(net_af_packet, pmd_af_packet_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_af_packet, "iface= " "qpairs= " "blocksz= " diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index e38c238..416bcbb 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -641,7 +641,7 @@ static struct eth_driver rte_bnx2xvf_pmd = { .dev_private_size = sizeof(struct bnx2x_softc), }; -DRIVER_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map); -DRIVER_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); +RTE_PMD_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map); +RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 427aa69..24e668d 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1121,5 +1121,5 @@ static struct eth_driver bnxt_rte_pmd = { .dev_private_size = sizeof(struct bnxt), }; -DRIVER_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); +RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 970fe0c..d3c3e14 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2513,9 +2513,9 @@ static struct rte_vdev_driver bond_drv = { .remove = bond_remove, }; -DRIVER_REGISTER_VDEV(net_bonding, bond_drv); +RTE_PMD_REGISTER_VDEV(net_bonding, bond_drv); -DRIVER_REGISTER_PARAM_STRING(net_bonding, +RTE_PMD_REGISTER_PARAM_STRING(net_bonding, "slave= " "primary= " "mode=[0-6] " diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index d3ff94a..b7f28eb 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -1048,5 +1048,5 @@ static struct eth_driver rte_cxgbe_pmd = { .dev_private_size = sizeof(struct port_info), }; -DRIVER_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl); +RTE_PMD_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl); diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index f767e1c..99d07f0 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1793,5 +1793,5 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev, return 0; } -DRIVER_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map); +RTE_PMD_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 5a1a83e..1a7d9b8 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5226,7 +5226,7 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) E1000_WRITE_FLUSH(hw); } -DRIVER_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map); -DRIVER_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); +RTE_PMD_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map); +RTE_PMD_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 6efd801..2227265 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1695,5 +1695,5 @@ static struct eth_driver rte_ena_pmd = { .dev_private_size = sizeof(struct ena_adapter), }; -DRIVER_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); +RTE_PMD_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 82dc265..45756d4 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -643,5 +643,5 @@ static struct eth_driver rte_enic_pmd = { .dev_private_size = sizeof(struct enic), }; -DRIVER_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); +RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 372564b..c804436 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3071,5 +3071,5 @@ static struct eth_driver rte_pmd_fm10k = { .dev_private_size = sizeof(struct fm10k_adapter), }; -DRIVER_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map); +RTE_PMD_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map); diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 697800e..5d8845a 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -702,8 +702,8 @@ rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev *dev, return 0; } -DRIVER_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map); +RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map); #ifndef I40E_GLQF_ORT #define I40E_GLQF_ORT(_i) (0x00268900 + ((_i) * 4)) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 34eb274..635a170 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1564,8 +1564,8 @@ static struct eth_driver rte_i40evf_pmd = { .dev_private_size = sizeof(struct i40e_adapter), }; -DRIVER_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map); +RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map); static int i40evf_dev_configure(struct rte_eth_dev *dev) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 6b3d4fa..685f0f2 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -7348,7 +7348,7 @@ ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, ixgbevf_dev_interrupt_action(dev); } -DRIVER_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map); -DRIVER_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); +RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map); +RTE_PMD_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 1553b2e..12ab7da 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5940,5 +5940,5 @@ rte_mlx4_pmd_init(void) rte_eal_pci_register(&mlx4_driver.pci_drv); } -DRIVER_EXPORT_NAME(net_mlx4, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_mlx4, mlx4_pci_id_map); +RTE_PMD_EXPORT_NAME(net_mlx4, __COUNTER__); +RTE_PMD_REGISTER_PCI_TABLE(net_mlx4, mlx4_pci_id_map); diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 758df6e..3678aad 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -756,5 +756,5 @@ rte_mlx5_pmd_init(void) rte_eal_pci_register(&mlx5_driver.pci_drv); } -DRIVER_EXPORT_NAME(net_mlx5, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_mlx5, mlx5_pci_id_map); +RTE_PMD_EXPORT_NAME(net_mlx5, __COUNTER__); +RTE_PMD_REGISTER_PCI_TABLE(net_mlx5, mlx5_pci_id_map); diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c index b9eefdf..adf299b 100644 --- a/drivers/net/mpipe/mpipe_tilegx.c +++ b/drivers/net/mpipe/mpipe_tilegx.c @@ -1631,8 +1631,8 @@ static struct rte_vdev_driver pmd_mpipe_gbe_drv = { .probe = rte_pmd_mpipe_probe, }; -DRIVER_REGISTER_VDEV(net_mpipe_xgbe, pmd_mpipe_xgbe_drv); -DRIVER_REGISTER_VDEV(net_mpipe_gbe, pmd_mpipe_gbe_drv); +RTE_PMD_REGISTER_VDEV(net_mpipe_xgbe, pmd_mpipe_xgbe_drv); +RTE_PMD_REGISTER_VDEV(net_mpipe_gbe, pmd_mpipe_gbe_drv); static void __attribute__((constructor, used)) mpipe_init_contexts(void) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index d526f34..faf725c 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2479,8 +2479,8 @@ static struct eth_driver rte_nfp_net_pmd = { .dev_private_size = sizeof(struct nfp_net_adapter), }; -DRIVER_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map); +RTE_PMD_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map); /* * Local variables: diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index c2e10a8..0b7cc37 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -691,7 +691,7 @@ static struct rte_vdev_driver pmd_null_drv = { .remove = rte_pmd_null_remove, }; -DRIVER_REGISTER_VDEV(net_null, pmd_null_drv); -DRIVER_REGISTER_PARAM_STRING(net_null, +RTE_PMD_REGISTER_VDEV(net_null, pmd_null_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_null, "size= " "copy="); diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 965c999..0c4711d 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1064,8 +1064,8 @@ static struct rte_vdev_driver pmd_pcap_drv = { .remove = pmd_pcap_remove, }; -DRIVER_REGISTER_VDEV(net_pcap, pmd_pcap_drv); -DRIVER_REGISTER_PARAM_STRING(net_pcap, +RTE_PMD_REGISTER_VDEV(net_pcap, pmd_pcap_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_pcap, ETH_PCAP_RX_PCAP_ARG "= " ETH_PCAP_TX_PCAP_ARG "= " ETH_PCAP_RX_IFACE_ARG "= " diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index d00c1d9..452139d 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1502,7 +1502,7 @@ static struct eth_driver rte_qede_pmd = { .dev_private_size = sizeof(struct qede_dev), }; -DRIVER_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map); -DRIVER_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map); +RTE_PMD_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map); +RTE_PMD_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map); diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index b91f222..fb423fa 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -628,6 +628,6 @@ static struct rte_vdev_driver pmd_ring_drv = { .remove = rte_pmd_ring_remove, }; -DRIVER_REGISTER_VDEV(net_ring, pmd_ring_drv); -DRIVER_REGISTER_PARAM_STRING(net_ring, +RTE_PMD_REGISTER_VDEV(net_ring, pmd_ring_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_ring, "nodeaction=[attach|detach]"); diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index f4ec5ea..f3cd52d 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -1581,5 +1581,5 @@ static struct eth_driver szedata2_eth_driver = { .dev_private_size = sizeof(struct pmd_internals), }; -DRIVER_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv); -DRIVER_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table); +RTE_PMD_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table); diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index b758c9f..44afdbe 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -1780,5 +1780,5 @@ static struct eth_driver rte_nicvf_pmd = { .dev_private_size = sizeof(struct nicvf), }; -DRIVER_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map); +RTE_PMD_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map); diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index c1d09a0..036cbd1 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1230,7 +1230,7 @@ static struct rte_vdev_driver pmd_vhost_drv = { .remove = rte_pmd_vhost_remove, }; -DRIVER_REGISTER_VDEV(net_vhost, pmd_vhost_drv); -DRIVER_REGISTER_PARAM_STRING(net_vhost, +RTE_PMD_REGISTER_VDEV(net_vhost, pmd_vhost_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_vhost, "iface= " "queues="); diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index b4dfc0a..09355fe 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1557,5 +1557,5 @@ __rte_unused uint8_t is_rx) return 0; } -DRIVER_EXPORT_NAME(net_virtio, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); +RTE_PMD_EXPORT_NAME(net_virtio, __COUNTER__); +RTE_PMD_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 6fcedd9..bfdc3d0 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -478,8 +478,8 @@ static struct rte_vdev_driver virtio_user_driver = { .remove = virtio_user_pmd_remove, }; -DRIVER_REGISTER_VDEV(net_virtio_user, virtio_user_driver); -DRIVER_REGISTER_PARAM_STRING(net_virtio_user, +RTE_PMD_REGISTER_VDEV(net_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_PARAM_STRING(net_virtio_user, "path= " "mac= " "cq= " diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 51e2d4c..8bb13e5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -960,5 +960,5 @@ vmxnet3_process_events(struct vmxnet3_hw *hw) } #endif -DRIVER_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); +RTE_PMD_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv); +RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index fa01ba0..5a897b9 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -764,6 +764,6 @@ static struct rte_vdev_driver pmd_xenvirt_drv = { .remove = rte_pmd_xenvirt_remove, }; -DRIVER_REGISTER_VDEV(net_xenvirt, pmd_xenvirt_drv); -DRIVER_REGISTER_PARAM_STRING(net_xenvirt, +RTE_PMD_REGISTER_VDEV(net_xenvirt, pmd_xenvirt_drv); +RTE_PMD_REGISTER_PARAM_STRING(net_xenvirt, "mac="); diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index d1f0ad8..4f3b493 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -84,7 +84,7 @@ rte_eal_dev_init(void) /* * Note that the dev_driver_list is populated here * from calls made to rte_eal_driver_register from constructor functions - * embedded into PMD modules via the DRIVER_REGISTER_VDEV macro + * embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro */ /* call the init function for each virtual device */ diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index d159991..b3873bd 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -222,19 +222,19 @@ int rte_eal_dev_attach(const char *name, const char *devargs); */ int rte_eal_dev_detach(const char *name); -#define DRIVER_EXPORT_NAME_ARRAY(n, idx) n##idx[] +#define RTE_PMD_EXPORT_NAME_ARRAY(n, idx) n##idx[] -#define DRIVER_EXPORT_NAME(name, idx) \ -static const char DRIVER_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ +#define RTE_PMD_EXPORT_NAME(name, idx) \ +static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ __attribute__((used)) = RTE_STR(name) #define DRV_EXP_TAG(name, tag) __##name##_##tag -#define DRIVER_REGISTER_PCI_TABLE(name, table) \ +#define RTE_PMD_REGISTER_PCI_TABLE(name, table) \ static const char DRV_EXP_TAG(name, pci_tbl_export)[] __attribute__((used)) = \ RTE_STR(table) -#define DRIVER_REGISTER_PARAM_STRING(name, str) \ +#define RTE_PMD_REGISTER_PARAM_STRING(name, str) \ static const char DRV_EXP_TAG(name, param_string_export)[] \ __attribute__((used)) = str diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 3a8e8c8..9ce8847 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -487,14 +487,14 @@ void rte_eal_pci_dump(FILE *f); void rte_eal_pci_register(struct rte_pci_driver *driver); /** Helper for PCI device registration from driver (eth, crypto) instance */ -#define DRIVER_REGISTER_PCI(nm, pci_drv) \ +#define RTE_PMD_REGISTER_PCI(nm, pci_drv) \ RTE_INIT(pciinitfn_ ##nm); \ static void pciinitfn_ ##nm(void) \ {\ (pci_drv).driver.name = RTE_STR(nm);\ rte_eal_pci_register(&pci_drv); \ } \ -DRIVER_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __COUNTER__) /** * Unregister a PCI driver. diff --git a/lib/librte_eal/common/include/rte_vdev.h b/lib/librte_eal/common/include/rte_vdev.h index 0dec8eb..97260b2 100644 --- a/lib/librte_eal/common/include/rte_vdev.h +++ b/lib/librte_eal/common/include/rte_vdev.h @@ -81,14 +81,14 @@ void rte_eal_vdrv_register(struct rte_vdev_driver *driver); */ void rte_eal_vdrv_unregister(struct rte_vdev_driver *driver); -#define DRIVER_REGISTER_VDEV(nm, vdrv)\ +#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\ RTE_INIT(vdrvinitfn_ ##vdrv);\ static void vdrvinitfn_ ##vdrv(void)\ {\ (vdrv).driver.name = RTE_STR(nm);\ rte_eal_vdrv_register(&vdrv);\ } \ -DRIVER_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __COUNTER__) #ifdef __cplusplus } diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk index a42ef03..c3eb779 100644 --- a/mk/internal/rte.compile-pre.mk +++ b/mk/internal/rte.compile-pre.mk @@ -87,7 +87,8 @@ endif PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'DRIVER_REGISTER_.*(.*)' $<; then \ +PMDINFO_TO_O = if grep -E 'RTE_PMD_REGISTER_PCI\([0-9a-zA-Z,_\. ]+\)|RTE_PMD_REGISTER_VDEV\([0-9a-zA-Z,_\. ]+\)' $<;\ + then \ echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ $(PMDINFO_GEN) && \ echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \