From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0089.outbound.protection.outlook.com [104.47.33.89]) by dpdk.org (Postfix) with ESMTP id 5412091A9 for ; Wed, 7 Sep 2016 16:10:22 +0200 (CEST) Received: from BN6PR03CA0060.namprd03.prod.outlook.com (10.173.137.22) by BY2PR0301MB2006.namprd03.prod.outlook.com (10.163.196.28) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9; Wed, 7 Sep 2016 14:10:14 +0000 Received: from BN1BFFO11FD012.protection.gbl (2a01:111:f400:7c10::1:112) by BN6PR03CA0060.outlook.office365.com (2603:10b6:404:4c::22) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Wed, 7 Sep 2016 14:10:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; rehivetech.com; dkim=none (message not signed) header.d=none;rehivetech.com; dmarc=fail action=none header.from=nxp.com; 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 BN1BFFO11FD012.mail.protection.outlook.com (10.58.144.75) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Wed, 7 Sep 2016 14:10:13 +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 u87E8BD2013556; Wed, 7 Sep 2016 07:10:10 -0700 From: Shreyansh Jain To: CC: , Shreyansh Jain , "Jan Viktorin" Date: Wed, 7 Sep 2016 19:38:09 +0530 Message-ID: <1473257297-7221-18-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473257297-7221-1-git-send-email-shreyansh.jain@nxp.com> References: <1466510566-9240-1-git-send-email-shreyansh.jain@nxp.com> <1473257297-7221-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131177310135530394; (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)(189002)(199003)(356003)(5890100001)(77096005)(86362001)(2351001)(575784001)(19580405001)(50466002)(92566002)(7846002)(2950100001)(47776003)(106466001)(229853001)(33646002)(19580395003)(48376002)(50986999)(76176999)(11100500001)(36756003)(105606002)(85426001)(68736007)(8936002)(50226002)(586003)(2906002)(4326007)(305945005)(5003940100001)(8666005)(104016004)(189998001)(8676002)(110136002)(5660300001)(626004)(81156014)(97736004)(81166006)(87936001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB2006; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD012; 1:LZTDznxKbgM/Cd+lg7l5o9TsLZ2Ow7wNRmyPgyCMZe0a0KIgaaasG8eYcgZLtF5TwJU27PdAN3ykFgynFPPMXP93d82UoiRIv95xR+LgCVj4SwmuMWXY3F//ZTNEBLR2sZ/cGdixkul0ymY0s/F3O3UyAVTgynCTWJsk3V7xzz//CSykRt3KNQ7CqnO5jMSyCWey+ohM2gTXRnbXMBYgTr2sBp1A1uGmqWS7Q1fRV/IH7rva528/7OBQyX/MkRq/hYsTbn/zWStfbyfB7pGKFI8u8CIRMoVZttDVqAmeZ2Dk5Knb2G8td/gKW6VpSoxgg+t7GMbksBU1/NQtQ8MAyj/kjDYeBOcIHzRExNNnIIBewUwN4VlDG2ieQHwX/1vLt9a494mlr06hGm4UWm73uDkv56Gbbb79f+DRxnOZQ+0sUz/jDkFtEg70Nj8id1YJx4JKlSD1jmT7jmOuyQ4xiK1YytIbT7VwSYd0fn3cddOAsVZlslaLA7LSzONHASvMRDUnChlnskZXDCVnSFiN+aUM+Hu58E4ph3hjXxGxc3h5BpNpkxycbhlqJiMEWjNigw13t/NNWRKQgI7QrTQ5+sHF/uHzXfwJpebfmwTfmCgzdZFQF1UEOAADmOqCVV0g MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 1d38801b-0a0f-4807-c731-08d3d728af99 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 2:XQzv23nbV1Qlp81v4GNR4SkKEve3UU1iHtXbhvgUdW5JsukwblE5A3Bd77UKq1Vsi8eb7xxU8YJ72Gchg12s9Zcd0/mdEb3X+SiNoZcSWQ9wJH/LqvasY2ObTSRmMAjLE1E9OxL1SAqEZw4pFtG/ys4+wf9LHrbJkT4cAJvBkQSJfmIhYhcd1FGK5tPT8O+2; 3:Qbe7SzHdW+wq/X+qbyAIGpqZw1EGzl78HgFpQBsB51Hw/jha6mu7BU1pw0XXW/Eft+MnRZQij7oR4KdpvUBBxpS2JmJ0yqPeYUG6dbW6Q19bJEZt4j58kIOZdAg0VuAX+1rmzeyo5hr2bv1Lz+KpM0DNScT4PYIzJRN2yW0utpulcUq0vfvFZy1hYNrwXHyrQ3yYYT5PwPPwa/YNpejGe+zrF+2Edsfc8Wqg6h+s3M0=; 25:HBkYrsOmSkhfCDHzhwIfL9JvHm8NylbTEOaH0s5vPGagXCnGbPBs03Kg1q6eWm4LAIN8qMKHWYBi/+00TDX3f5i9MVAUupVglEneh1MjGbXNqOxozVOxXhZ5C975ffzHMdh0/yMb3GFBmrWkKryPx/Gh5ZBlHYYNI0DOSzD1kjtIt13lD9bNNVQmdEOGsI+JkOGUl+yR6zZKnotrDTFFExazDwWpJM0xzTPju3mfUQ/BtrSCmj/xLMOzujigZl+hHlTaw9EFEcB40iqdnx17RIkywfg4rfAkyu7KWbex57mwNcb2S8UIWWvcoZ9Ikw0G8/zHh5G/8gufaq64E7FMDsjK961SXovm7IFhvZixBLssHpcROVFL9PCeVQDVRP+u7iSnOcCmLciO92oVwebvbSOTqRUvDhmHbYNfLQz1TLg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2006; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 31:IgF6sKZuqVbOEgF/104K5HZe2nG7xYea3aBIWq9YDDDZRlZyZS2avrlxN1Qr6LBwiGcOGUx0Swj4oeQRN2YRiuAsLnKGuUUbqjMRMU+PUHUW8aTezzm6e+czf99ppoElrg2L955wY7EoLguJd1G1DPnak7gAhbPZPnxNHgYHsuHQEBlXu6NUZyVr0fuLe9VKjd0ShvvD0850iIbLjCoQwrRWaS3mf1MPU8pwU6mkaWc=; 4:7M7lvbeLiZZyBn7OINlPqxbOTVddfrLNSt32dknEMHI9P4I94mG5qLF8BdXJkYcrFxObxmi5EbJP1bqzzyP1Oo5D5YecFCjStz7uKRqc3LH2KD9kPQ53WShtXNBPVcmG6HaoNCJTqvhf+QBtYHNx1Xh2p8dASucBMuy7kK4vjYZVO5B4nSo9LaAIKjAcAnYW10GG601CPgtMCv8swoeV54QMNWrFzyCgUse7g+IwD5AYigYCfPrD9zPB4Fnp08d9TlpXBkG9J7+4A9j9Mf/wSOuOiBO2rvxXRh5JnEDh3hUeFEMbh94QUu4t7SprBrEdCDHiBFTTS+s54N9hW+qx5J8ae+a/ODjhBWHtIyRj85iL2WgX/Kh1I0PV3h45TmV4LaUP+i1JD/xJp4tbP8PsaXTl6uGL1DGUN9PAwt+J4Hgvkh0piRlE9J2QgwlBNq7INxkR/AA7P4zwlZruaZWWvDJU4Z+LvHX7p/2YdMu7j5dzG/u8v4doPliULiuMyN+/rWDn9/PRS0bW3iPMIC5t/4XoUOKrzF/R9Sot13B90UM= 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)(13017025)(13023025)(13024025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BY2PR0301MB2006; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB2006; X-Forefront-PRVS: 0058ABBBC7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB2006; 23:XuJhpKjJhUgn+AQnBoXgc4o7cEwiIypJ7YEiSey?= =?us-ascii?Q?2KSp6z15m4aGK7h9/0S84dRSqOx1e31/TTVfQHbWS2+QhUp18SOQkB7OIJZ0?= =?us-ascii?Q?pWu+tkAs2Jmb3cWNjrwRP9s3oYyJy95QkrYq8hGcIjfPe2nB9nnmW2TEGChE?= =?us-ascii?Q?xTKWi7ebtdNutSMeC27HK9Mzyh4XAHiQ4XOlzuRqklwQ8jGulIZAMZAtduFq?= =?us-ascii?Q?loH+ehTkmHE0hmloKvSbpY0EqnMsvEfsklpvXR9KWhdlKd+yECjlQE5b2dtm?= =?us-ascii?Q?mSZr078h2D1m1cVlzyh0x/hgNPeJa2mIDWcNatx4XQG7/sTyujGQH+NeCMc9?= =?us-ascii?Q?YHnIJmqYMRztbqM6uwfXgGOV1AAudgBuxO8C+Q3jw+uyLRwJnWawSLj3EnR6?= =?us-ascii?Q?G6vqgJE3hH9DU025n1RxwV5aI42oSzisW68oj0IdGOEvX2oFS9/3NjbWL+7c?= =?us-ascii?Q?ONVSExIgYfhdNQbPZYwu+Dy4Q8960ZNbtCOFQUTmOcUpcpfYq/Rm4PpFjQve?= =?us-ascii?Q?e0f4XXCqbE5D9+6iqt69L0ai6P+KYxVYFK44njOC1pPeeVvk4vpFKkYg3whJ?= =?us-ascii?Q?dWbUzW579d/t3IAlK7IsWEMpMPZEqJNw5BSSVkoataMS1kwcyYOvOWDj63SP?= =?us-ascii?Q?DpDbrhkk77q15qz/RqkOHPByrGTLJpgU0dgEGI2Guk4kgJsll7zEMjOL2rT7?= =?us-ascii?Q?l+4t9i2sfmfiacpVMPPE9iW/gKDZBFSF76tsY/xLap+2MfVlukCXL7RRGpnF?= =?us-ascii?Q?lXn1GAOPLaj/tOfCpMgOx0ElDYbsdr0NmoEe4pZr8FFsulLtTHLZQbX2NGpi?= =?us-ascii?Q?/PgCYQAxuR3G96aRPwXR+7HW0PYzsO3NxPYknIj9rmkH3eyBWzrN1gLgbDbi?= =?us-ascii?Q?ou6mU4ZMbs36CBKANWKSSwlfd6t7onVHl0vfyATE/YbZLhbN3oAfdZRNIeGF?= =?us-ascii?Q?bQOlvwjZULLV28Ae0pEKjctqsugutBVHwrDvAP/UBR/jzpeprKpq2JzdKEHa?= =?us-ascii?Q?ASTiqz9VNf9FJkVEWAMf7/fw7j2Vkx+cFgHdKHMnTbUa4vGSh/eFQpuusWlN?= =?us-ascii?Q?RGx1f8n5UL3yP/KPh49kXTlL9TbBin1cNrqjI4ZmRBbIPLsLU+Tjo9lVuWgT?= =?us-ascii?Q?Q8I/ajAzSNS/iWKlEUWlsWGRdM28RqOeqJHrjJDf4q21FsYiNqi56wKf8Gqn?= =?us-ascii?Q?6K9odomdrObXr6AuYYiagQHkpjzODemGXBtH3xFtdNIgm4SqQ6sSk8iOVfw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 6:zQehhoacmCYOl+W/dCItqzBfj1BASqUM08uJ/AVSi6WOcwf88kCBU/oIxdjC7AAZJ9lcAw6mVoIgehwEWvyfAGtbhqJkH94OvsTRAy+kyywcQiWpzWZamIRR8RueWoI+fpGeETUVoAndHGImqquVBWkZuWerffX+fz+5DmxKDUkhkZ5toN03/1wKvp9Te/A1g8NTzt8ah/shR6ho3cvJLYHNhgD2D50NvOoMVmuZvmH1Xh6TPPw+P+ZJIKQGcU5dPz3Pk1JI6+HZFdZjHuRrkPp+ug5nJiU8x1gyvBSFrX8=; 5:Qa6NotpSkIC7S1u9vKuDht/yfm1GXG8+AUWuvERp3PHOsVJHiDpcFz2LXCeeAHO4257XHCFvZiBdPTnAouVCuo9uRcOYil+L/VfWLaShGHGFnpeupA5wdl35X/xYA3k7PKTl55iXUnzWk1L/hhMW9Hv+BEWDWkqJn9icwkZYNuE=; 24:ERXB5NQOwzIeWoiI7UehyOViP0ey3nqWnDi4masIsDvWcgv6hsOITma7cfLof4EDsuaj2R4tqF9z/snEZENvSIR8B4+yKxnibvtT0wt4F+c=; 7:wEShGNi/XWm50fq+PYFnq3uHMSAHS5qdZyOi0vu5ZH9ZcUD6jP0Maa42F/GgfO0VrnVs/pZBRR5gL1luHcIFTb/0yzqMXSYwexKyJvDHvuTnKFLOuWYIEwcpRhY3JK0rY87lAP+JXqGxeEPrlrEFERrrs7Pu6STh04F/SOv5Q92pneNbwPYlNF5YmdMlA5lEEO3asbLOCQ3ykNduYN/3XXO7c0DT333ZMF1dFbLZQIGwKe/diXwY+4oAqOmiHLXt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2016 14:10:13.2254 (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: BY2PR0301MB2006 Subject: [dpdk-dev] [PATCH v9 17/25] drivers: convert PMD_VDEV drivers to use rte_vdev_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: , X-List-Received-Date: Wed, 07 Sep 2016 14:10:23 -0000 All PMD_VDEV drivers can now use rte_vdev_driver instead of the rte_driver (which is embedded in the rte_vdev_driver). Signed-off-by: Jan Viktorin Signed-off-by: Shreyansh Jain --- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 14 ++++++++------ drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 14 ++++++++------ drivers/crypto/kasumi/rte_kasumi_pmd.c | 14 ++++++++------ drivers/crypto/null/null_crypto_pmd.c | 14 ++++++++------ drivers/crypto/snow3g/rte_snow3g_pmd.c | 14 ++++++++------ drivers/net/af_packet/rte_eth_af_packet.c | 14 ++++++++------ drivers/net/bonding/rte_eth_bond_pmd.c | 14 ++++++++------ drivers/net/mpipe/mpipe_tilegx.c | 22 +++++++++++++--------- drivers/net/null/rte_eth_null.c | 14 ++++++++------ drivers/net/pcap/rte_eth_pcap.c | 14 ++++++++------ drivers/net/ring/rte_eth_ring.c | 14 ++++++++------ drivers/net/vhost/rte_eth_vhost.c | 14 ++++++++------ drivers/net/virtio/virtio_user_ethdev.c | 13 ++++++++----- drivers/net/xenvirt/rte_eth_xenvirt.c | 14 ++++++++------ 14 files changed, 117 insertions(+), 86 deletions(-) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index dc0b033..e1d5e37 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -514,13 +514,15 @@ aesni_gcm_uninit(const char *name) return 0; } -static struct rte_driver aesni_gcm_pmd_drv = { - .type = PMD_VDEV, - .init = aesni_gcm_init, - .uninit = aesni_gcm_uninit +static struct rte_vdev_driver aesni_gcm_pmd_drv = { + .driver = { + .type = PMD_VDEV, + .init = aesni_gcm_init, + .uninit = aesni_gcm_uninit + }, }; -PMD_REGISTER_DRIVER(aesni_gcm_pmd_drv, CRYPTODEV_NAME_AESNI_GCM_PMD); +DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD, aesni_gcm_pmd_drv); DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index b2d0c8c..2ba5389 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include @@ -714,13 +714,15 @@ cryptodev_aesni_mb_uninit(const char *name) return 0; } -static struct rte_driver cryptodev_aesni_mb_pmd_drv = { - .type = PMD_VDEV, - .init = cryptodev_aesni_mb_init, - .uninit = cryptodev_aesni_mb_uninit +static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = { + .driver = { + .type = PMD_VDEV, + .init = cryptodev_aesni_mb_init, + .uninit = cryptodev_aesni_mb_uninit + }, }; -PMD_REGISTER_DRIVER(cryptodev_aesni_mb_pmd_drv, CRYPTODEV_NAME_AESNI_MB_PMD); +DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD, cryptodev_aesni_mb_pmd_drv); DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index 4e21743..a30e776 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -650,13 +650,15 @@ cryptodev_kasumi_uninit(const char *name) return 0; } -static struct rte_driver cryptodev_kasumi_pmd_drv = { - .type = PMD_VDEV, - .init = cryptodev_kasumi_init, - .uninit = cryptodev_kasumi_uninit +static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = { + .driver = { + .type = PMD_VDEV, + .init = cryptodev_kasumi_init, + .uninit = cryptodev_kasumi_uninit + }, }; -PMD_REGISTER_DRIVER(cryptodev_kasumi_pmd_drv, CRYPTODEV_NAME_KASUMI_PMD); +DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv); DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index 909b04f..8ab34de 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "null_crypto_pmd_private.h" @@ -268,13 +268,15 @@ cryptodev_null_uninit(const char *name) return 0; } -static struct rte_driver cryptodev_null_pmd_drv = { - .type = PMD_VDEV, - .init = cryptodev_null_init, - .uninit = cryptodev_null_uninit +static struct rte_vdev_driver cryptodev_null_pmd_drv = { + .driver = { + .type = PMD_VDEV, + .init = cryptodev_null_init, + .uninit = cryptodev_null_uninit + }, }; -PMD_REGISTER_DRIVER(cryptodev_null_pmd_drv, CRYPTODEV_NAME_NULL_PMD); +DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv); DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 87cd070..8b356a3 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -638,13 +638,15 @@ cryptodev_snow3g_uninit(const char *name) return 0; } -static struct rte_driver cryptodev_snow3g_pmd_drv = { - .type = PMD_VDEV, - .init = cryptodev_snow3g_init, - .uninit = cryptodev_snow3g_uninit +static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = { + .driver = { + .type = PMD_VDEV, + .init = cryptodev_snow3g_init, + .uninit = cryptodev_snow3g_uninit + }, }; -PMD_REGISTER_DRIVER(cryptodev_snow3g_pmd_drv, CRYPTODEV_NAME_SNOW3G_PMD); +DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv); DRIVER_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index d629ee3..95aa573 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -889,13 +889,15 @@ rte_pmd_af_packet_devuninit(const char *name) return 0; } -static struct rte_driver pmd_af_packet_drv = { - .type = PMD_VDEV, - .init = rte_pmd_af_packet_devinit, - .uninit = rte_pmd_af_packet_devuninit, +static struct rte_vdev_driver pmd_af_packet_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_af_packet_devinit, + .uninit = rte_pmd_af_packet_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_af_packet_drv, eth_af_packet); +DRIVER_REGISTER_VDEV(eth_af_packet, pmd_af_packet_drv); DRIVER_REGISTER_PARAM_STRING(eth_af_packet, "iface= " "qpairs= " diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index b20a272..3209dbc 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -2508,13 +2508,15 @@ bond_ethdev_configure(struct rte_eth_dev *dev) return 0; } -static struct rte_driver bond_drv = { - .type = PMD_VDEV, - .init = bond_init, - .uninit = bond_uninit, +static struct rte_vdev_driver bond_drv = { + .driver = { + .type = PMD_VDEV, + .init = bond_init, + .uninit = bond_uninit + }, }; -PMD_REGISTER_DRIVER(bond_drv, eth_bond); +DRIVER_REGISTER_VDEV(eth_bond, bond_drv); DRIVER_REGISTER_PARAM_STRING(eth_bond, "slave= " diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c index c0d0e3b..6d0dc86 100644 --- a/drivers/net/mpipe/mpipe_tilegx.c +++ b/drivers/net/mpipe/mpipe_tilegx.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -1623,18 +1623,22 @@ rte_pmd_mpipe_devinit(const char *ifname, return 0; } -static struct rte_driver pmd_mpipe_xgbe_drv = { - .type = PMD_VDEV, - .init = rte_pmd_mpipe_devinit, +static struct rte_vdev_driver pmd_mpipe_xgbe_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_mpipe_devinit + }, }; -static struct rte_driver pmd_mpipe_gbe_drv = { - .type = PMD_VDEV, - .init = rte_pmd_mpipe_devinit, +static struct rte_vdev_driver pmd_mpipe_gbe_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_mpipe_devinit + }, }; -PMD_REGISTER_DRIVER(pmd_mpipe_xgbe_drv, xgbe); -PMD_REGISTER_DRIVER(pmd_mpipe_gbe_drv, gbe); +DRIVER_REGISTER_VDEV(xgbe, pmd_mpipe_xgbe_drv); +DRIVER_REGISTER_VDEV(gbe, pmd_mpipe_gbe_drv); static void __attribute__((constructor, used)) mpipe_init_contexts(void) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index ce49945..75bad6c 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -686,13 +686,15 @@ rte_pmd_null_devuninit(const char *name) return 0; } -static struct rte_driver pmd_null_drv = { - .type = PMD_VDEV, - .init = rte_pmd_null_devinit, - .uninit = rte_pmd_null_devuninit, +static struct rte_vdev_driver pmd_null_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_null_devinit, + .uninit = rte_pmd_null_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_null_drv, eth_null); +DRIVER_REGISTER_VDEV(eth_null, pmd_null_drv); DRIVER_REGISTER_PARAM_STRING(eth_null, "size= " "copy="); diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 7fbc60e..b72d07e 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include @@ -1083,13 +1083,15 @@ rte_pmd_pcap_devuninit(const char *name) return 0; } -static struct rte_driver pmd_pcap_drv = { - .type = PMD_VDEV, - .init = rte_pmd_pcap_devinit, - .uninit = rte_pmd_pcap_devuninit, +static struct rte_vdev_driver pmd_pcap_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_pcap_devinit, + .uninit = rte_pmd_pcap_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_pcap_drv, eth_pcap); +DRIVER_REGISTER_VDEV(eth_pcap, pmd_pcap_drv); DRIVER_REGISTER_PARAM_STRING(eth_pcap, "rx_pcap= " "tx_pcap= " diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 5690dcd..67cbee3 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -623,12 +623,14 @@ rte_pmd_ring_devuninit(const char *name) return 0; } -static struct rte_driver pmd_ring_drv = { - .type = PMD_VDEV, - .init = rte_pmd_ring_devinit, - .uninit = rte_pmd_ring_devuninit, +static struct rte_vdev_driver pmd_ring_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_ring_devinit, + .uninit = rte_pmd_ring_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_ring_drv, eth_ring); +DRIVER_REGISTER_VDEV(eth_ring, pmd_ring_drv); DRIVER_REGISTER_PARAM_STRING(eth_ring, "nodeaction=[attach|detach]"); diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 2bb761b..94577e9 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -924,13 +924,15 @@ rte_pmd_vhost_devuninit(const char *name) return 0; } -static struct rte_driver pmd_vhost_drv = { - .type = PMD_VDEV, - .init = rte_pmd_vhost_devinit, - .uninit = rte_pmd_vhost_devuninit, +static struct rte_vdev_driver pmd_vhost_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_vhost_devinit, + .uninit = rte_pmd_vhost_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_vhost_drv, eth_vhost); +DRIVER_REGISTER_VDEV(eth_vhost, pmd_vhost_drv); DRIVER_REGISTER_PARAM_STRING(eth_vhost, "iface= " "queues="); diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index aadfdc0..08cd4c2 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -37,6 +37,7 @@ #include #include +#include #include "virtio_ethdev.h" #include "virtio_logs.h" @@ -461,13 +462,15 @@ virtio_user_pmd_devuninit(const char *name) return 0; } -static struct rte_driver virtio_user_driver = { - .type = PMD_VDEV, - .init = virtio_user_pmd_devinit, - .uninit = virtio_user_pmd_devuninit, +static struct rte_vdev_driver virtio_user_driver = { + .driver = { + .type = PMD_VDEV, + .init = virtio_user_pmd_devinit, + .uninit = virtio_user_pmd_devuninit + }, }; -PMD_REGISTER_DRIVER(virtio_user_driver, virtio_user); +DRIVER_REGISTER_VDEV(virtio_user, virtio_user_driver); DRIVER_REGISTER_PARAM_STRING(virtio_user, "path= " "mac= " diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index 6b15381..c5d89fc 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include @@ -759,12 +759,14 @@ rte_pmd_xenvirt_devuninit(const char *name) return 0; } -static struct rte_driver pmd_xenvirt_drv = { - .type = PMD_VDEV, - .init = rte_pmd_xenvirt_devinit, - .uninit = rte_pmd_xenvirt_devuninit, +static struct rte_vdev_driver pmd_xenvirt_drv = { + .driver = { + .type = PMD_VDEV, + .init = rte_pmd_xenvirt_devinit, + .uninit = rte_pmd_xenvirt_devuninit + }, }; -PMD_REGISTER_DRIVER(pmd_xenvirt_drv, eth_xenvirt); +DRIVER_REGISTER_VDEV(eth_xenvirt, pmd_xenvirt_drv); DRIVER_REGISTER_PARAM_STRING(eth_xenvirt, "mac="); -- 2.7.4