From patchwork Sat Oct 8 18:01:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 16453 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 917A4590F; Sat, 8 Oct 2016 20:00:22 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0075.outbound.protection.outlook.com [104.47.34.75]) by dpdk.org (Postfix) with ESMTP id BAEC5590B for ; Sat, 8 Oct 2016 20:00:20 +0200 (CEST) Received: from BLUPR0301CA0025.namprd03.prod.outlook.com (10.162.113.163) by CY4PR03MB2440.namprd03.prod.outlook.com (10.168.163.142) 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:00:18 +0000 Received: from BL2FFO11OLC015.protection.gbl (2a01:111:f400:7c09::183) by BLUPR0301CA0025.outlook.office365.com (2a01:111:e400:5259::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11 via Frontend Transport; Sat, 8 Oct 2016 18:00:18 +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 BL2FFO11OLC015.mail.protection.outlook.com (10.173.160.81) 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:00:18 +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 u98I0ELm011569; Sat, 8 Oct 2016 11:00:15 -0700 From: Shreyansh Jain To: CC: , , , Shreyansh Jain Date: Sat, 8 Oct 2016 23:31:08 +0530 Message-ID: <1475949668-26829-1-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475847187-28967-1-git-send-email-shreyansh.jain@nxp.com> References: <1475847187-28967-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131204232190178878; (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)(1109001)(1110001)(339900001)(199003)(189002)(68736007)(5003940100001)(6916009)(2906002)(85426001)(48376002)(104016004)(77096005)(106466001)(105606002)(5660300001)(2351001)(229853001)(2950100002)(50226002)(8666005)(5890100001)(7846002)(87936001)(92566002)(4326007)(575784001)(50466002)(86362001)(8936002)(305945005)(19580405001)(19580395003)(356003)(6666003)(8676002)(50986999)(76176999)(81156014)(189998001)(110136003)(81166006)(97736004)(586003)(626004)(11100500001)(36756003)(47776003)(33646002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2440; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC015; 1:UhQw3rQuAV1Vm/nCMZ09QSZF9jEBfpSKkFCknP/pl7PjjBI4WH5Pqya5gc+eyXWvq0UsdhtTkvuFNFRnCxYYLdPTONgVUx+3B+sq+h6+ukgTJrP04rxff4Jkj40yyitBz5rdocarCAHTuf8tb4ZlIxLmGeEbnH45LFesZS0OlwCdhVSw7Gq8/+d+x2NtB8rgPopY5Fj8bmz6dHA2KtQ9SToyqdo+TSQs+HXLczk2ZXwkrgL1qQhgvtsgtXry4CYcZ5zAvYhxkwr6v1VahP6AAj1eY6pkDt8F2WcG/uAOcZl1abFD6VwHdYr84Zj9Kg0ymg+noWeRfqDrkDyve/w3Q3i/xuWMANnBZruFk7sw0CPmAGpN4iuRGIhfzUPn3gkM0g/D4ODMP5TXZ5yMUj75hKgekEHWx6H1EI8qaef03bGMJUFZKhopLcnGsUKjV6j+Yr2xGp1sbmmjGTB8KmICoRZqNbnDPHPvz354YS8AX9Evv7AbuuNPc31C9j/qouCvAQqYr5BMr5BFKpHTwHR3VIl+cVPeoKM4ejFERlKSUXn/NR8TAPnjLJbo1Zefj3zfeQuchX9ixU3Vez+ycwlzG4uD8M4dKMAU5pEmYCLjkGrgCyON1JE+NMiSVwnwZJlVeLRjlEjhL8NrbP0mAu3/Wc8IJG09oHMoCilQkMPhGPJXiCViEkdw7gex0BBbYZUbeFv3k71+RkVSBLPiWudmvEZk06G/8BmxtPP2RmHToA8= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: edad142c-2312-4eac-c9f9-08d3efa4f71a X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2440; 2:4HK+v513KDBzFw9i91qvuIUkj2d1wsCmb28WFNmWEufbjc9WliIYNbJ5x6OEtuQfda+NOcWfwXbklCxBpA7RsS2Cop6rFSMM7rCPFbKWMUwCdrxO7UPjhY0vFbz/TJ14wILkzL9DV/P7/DVf2LOYKeUThn1G2OnkgcdWY8WhxtYwZ4oHSIAVLpLxz5QChS9anvy7vbFa5GQx0fy/7EFhlQ==; 3:svacC0ShZISBrm9I2rYtpmbAXTFN+rnwIuhzhP20nOXzNvr5eYfc/IZmhs+uU7E2C5GRLXr9gmYQGDDrh5F8ykypfvA5GzvzV/75D15060F4rDJU7rJIr69aYPaG/HV5sLKmISD0lyV61MLWuGg5kB+ZT8oUU3ZEwX27u6hSM003t4+8/5efupDXTYsCq7+xDy1T/B2SfX9f0/mceOGXLYZffONm2MGODAObdOAd2whzphQHPkeOxC/H6z2AEEc8; 25:MifGrIaqV95k5H5BCszNCZDICVJFQeJg9X1FVqjZZ/dgeQHqzu7+HWQonAhXdke9zF8P8afDEZY8wjKZpDjosEyyILXeQF+zQ0wvHFkLMvQvVjzBBvNYvUQ0/mhIcctX7mhzjxR9XpZfXbSV8+VsVYlHmmTpcmaiYyZTCPhKTDE1C1PoUOcr/tbWcmOHP1ewzMRz4z0xi2id54Z6XboRZm7ueq7ELNi/bb+ZGF2UUy2M4aJmDQ4VFXrIJFgfpkrO3y5kRPJ/cR4XmvgENo/3kHo+tscMNbqXZJc9SuivZzfthQI9LQE3oBRVHv2Ev8nrFw5KPmMJLW338o1sKJyT9UMCIW6r4D+uHqhIzsypz8GKFZWp7N5Ey8AFwi0Iz1ESxMkbvrV7WmKwrsYKPYAOoLb/JE3Qvc8wapg7EKcwb+IMN5BtKuzGzB4am34crDEY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR03MB2440; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2440; 31:rr8zXlJH20liRocy3dYmt8ezb5Bnq34gAqbqo+g0qorQXxbH7TgYJ8BKvzagsg9Dl7kteOdCizksPG9A/aMuTtM+hiCgj3EBWwMsU5D1tZydqKBmSRkm9NsLqb/CrYqRs7HB4kTl3xkXIrZ88gBeSZIcXA98YMyy0ieuro1hE7IDTciyU4wnXIZZvqDaWyEaEACkqSMaQHwyHYLXnjsLQgZHBHOY7ySpg1u0HSv/kZmU73j2V817nWhDYLhYR0Iu3o0R56xMFyxqgs6MbP0NGQ==; 4:hSqU/T6FtoQ+tQ3dUbP8DXIzBSg1otYkOydtYex8BZLHl9JL1QgkUrk4irLtN+Mu/14knx/yHOpZa2CHMCwmilMf2GWYKPZjxqI8bWnNn6JUy6L35+KkL5+stVtuB1hf3IPY9YPeapxdIjFlaH7rk0HqZrWJyBQSwa9VnrkCSNSCfUdkQsg3wiM4nFKtOEYjJpqUqbbziB9/wy3qHTBEf9AQwvXNBFRq/YOEZ0W2wjnmstFKrpdNPs7xzabdiCc13aGZA8A2zUWDawIfPuxp0192MiFRebrShicnnZPH8kWM81pKbVvHo8M0jJ3ubW1IJtZY/g7NYVOukF7RWQjIHSj0yhObsWtcSURArmyY46tmiCUgFUurjxaAI/6Kcjt2ndJduhhDB0wksirk9pjWJ1zAqRpA0ZZ3yy8cJGEP4cxklz7nSmyVrBKgPdyBLPMSNyt14DmVMpOFe6Rm0VB4Q0BK9qR5MiRyz2YpYCDSRhwdTPE3FMOtYnJwyhShOIdbL/FfM8b+3J6JR3xgJHNWFs4RTaIo7heQXzvjt/qGU4zUYZUdvTmwr/AOmGC/YG2p 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)(13015025)(13024025)(13018025)(13017025)(13023025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:CY4PR03MB2440; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2440; X-Forefront-PRVS: 008960E8EC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2440; 23:LsHtr30Z2Zi2/uzD7PgWOjM2P8YPl9MhyhB1WSrw0?= =?us-ascii?Q?EIQJs31QsZ+AwVLvgTErT/4jXRcIDFxuMK6GAmNKTmS55Wixd9XxSKtTBR4m?= =?us-ascii?Q?KajhUIwJWLfVm1ZRl8z68/fR2fI/8pAq2b9YQTnWMZx7gUxZhoUuiKNb0RG0?= =?us-ascii?Q?z1u6wq6ZTE3fQQQ4uLz74henyQH7n4B0iR5S/pkm3svMy2eqzquM1uWd1gUN?= =?us-ascii?Q?GQ92bgiDZl/ybuoRXiFBxIx4OtOsFQwh8IdcqQo9TovK+AaJ8H1gZ9N0QF7o?= =?us-ascii?Q?Vjsz5UOFuqY9nkVmmii8BGAYwVfqTC8VvW8HVFiNhFW96jdWvWRB8Bf06f04?= =?us-ascii?Q?xkU5Nz+5XVRv72tAHcRRqD9vv57LvyI2i5WGbA+oIlcFDFpp1NNVLlSbx7af?= =?us-ascii?Q?n8j6z79szSJ9g9C9EPe1V7iDlB56bfVzmoAVM+jROw/3IIq7C7zh12maXLLM?= =?us-ascii?Q?F1wVfdGaGyoIVpPpuYvRMVLFT4f6/6aHG2wQSh4gKLeHcvVXeE2svgSssZVM?= =?us-ascii?Q?DxxtWe/koI5ULvxC/7chAWtfccg1naYl1rxTFn3LMM/12DYjUjvwOzDu93Tx?= =?us-ascii?Q?+nJ+di9LAE8UykH55F3sUog5DclENlQPOMbGYV4rY8hsRD3bOT1SS2jEYE3Y?= =?us-ascii?Q?AV4i/0G+jUrqsTkbzF1gTdQI2TkmcSv5ThAbpWHVFZWuvp4Z+J30qu9PAxUi?= =?us-ascii?Q?o42+Bpl4QjvACg96jYnuVmCIPTgtwOAsaY8WOLH6rFQtaLjUrawqp5/rrqJR?= =?us-ascii?Q?Qcty4mZR11eI7hFoW5JBlRplNTjTqQxBGUQhdpTH6eM5Z59Z9gZz5A9sWja+?= =?us-ascii?Q?VcvE3fcUKbpcPx24aO/eZIvg8iL6FDYCCD2Kdg9wvqNuPnskR9ZBUbz/x93M?= =?us-ascii?Q?dshWOl+r5elNpBquz+CimHALabTJnUwHBRFhYSHyh/RtreveKhMc4VlQO+Ar?= =?us-ascii?Q?eIKEWArJDuWtlAezv4Otwvj01Sy2sdxASeyZwlilUbhJ6/LLoVsL1cl53Z9z?= =?us-ascii?Q?1qvxuZptXujPWfFwr+/arhSpX51J0JwMrnUp7yQdrrzWAUxuD/vneL0oYlD8?= =?us-ascii?Q?Hx0dE91ObyZh4ETSIoTV66h1krqa5Iun6PY+GbCQWKcZsgCqcbuuBY8w+J3H?= =?us-ascii?Q?f8LsjEyJqx16A7TCboC4kT7NPcRRys3qmZ41sskwfNcziUbNLhSVh1eutSUi?= =?us-ascii?Q?s1CEUx1O7dfE5RF9vlRmh3u/dmXTV4+LU/T33fzixoyReUV/1q/lxisOZZWe?= =?us-ascii?Q?8K8Qcohkxr1UPu1kfswJDyRdp8kcfeWnwIteIJ7?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2440; 6:IQHxrjTFGK51ofTsSF3WdQgAHBYCZmBUluXpY/0y9A3jLvA/7j4V67rhRdOzP6oW/N3G+NAAg8L+8yH+kiHfNSQGzQM9W0uZEGHxaIDY6qXV8hd7jaH1smdbQ2eZsuR4PLoyO6C0Tr//hfwBrHwCgqKMJ1G8DE2WENIRGCEkBvZoY+0MqfCS7/+IC8tA6AyPk3wybcVssKyfoOHC7lWN1nyZbM3Oy9shkMKmhzQeBwFmUec3NG+vga6IfFOyU8FCJXnwacqT+pgtrezXTqp6oFC3ILre7yXI52RJ4NSCgAiYCO+oP+i9I9LLIO8TqYgW; 5:zZRkpybmiEGet/y0ecm21maYonuEU/d6XqxmHg4A2hi5PZbVJeIZTj+r4dia4vXw1w+WEl3xo3zNALJ9rWlqY67ZFtRh4UCNrs22Ga1vrWWZPv31oC+AAGi+Rgp9gQ7MI2Zt2sJQCecLcd/FN9qzwL6it7js4FQjS1X60NGSR7GHCmdPVZFoCA7wmtiRl/so; 24:yfMELxfDrslSPZWHqipXpq30+svU7iAyDk2uo9GoaCpLi/Ry9Q3SStRVB4AKACzA2TEoCORBsKZLPXJNaoIKNaDlhbdLwGlgdapGlGOdjFo=; 7:YbxBLDJ7YBnTwgMyS1OZudeyotD/o7ATHhM9SAdLVtGaGYmQxvZn6EIRtoCngUelciQoJSpTQ0lNDhPyryhcVo8WntJXL1N0Pj09zVO3tgifVbqejGg5CCv0yVbg3IOzSkT1uHVnSSldVpENniuhMJXdm/Pcc5LnBlCKdtI7WgPlV9gHxd7P8CNfuelw4Y5aYEeJWoXuChVVJ4aEY5Q+NtIclZiWqw4EbwkscplOmJH7cNrgziXLazduR6cxuB+FGseDBxKfa0aJjgW3PkqvpZXIHKb3DRsbr+RaNUrKF3dEM5GULqMH9JI9n+xdxfcSyqVnO8xHPwdG7nVcaDbs8w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2016 18:00:18.7058 (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: CY4PR03MB2440 Subject: [dpdk-dev] [PATCH v1] drivers: prefix driver REGISTER macro with RTE EAL 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 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)" && \