From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0046.outbound.protection.outlook.com [104.47.34.46]) by dpdk.org (Postfix) with ESMTP id 57CB96004 for ; Fri, 26 Aug 2016 15:58:13 +0200 (CEST) Received: from DM5PR03CA0006.namprd03.prod.outlook.com (10.175.104.16) by BL2PR03MB1874.namprd03.prod.outlook.com (10.164.115.18) with Microsoft SMTP Server (TLS) id 15.1.409.10; Fri, 26 Aug 2016 13:58:10 +0000 Received: from BL2FFO11FD059.protection.gbl (2a01:111:f400:7c09::112) by DM5PR03CA0006.outlook.office365.com (2603:10b6:3:118::16) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9 via Frontend Transport; Fri, 26 Aug 2016 13:58:10 +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 BL2FFO11FD059.mail.protection.outlook.com (10.173.161.155) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Fri, 26 Aug 2016 13:58:10 +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 u7QDvHps023630; Fri, 26 Aug 2016 06:58:07 -0700 From: Shreyansh Jain To: CC: , , , , Shreyansh Jain Date: Fri, 26 Aug 2016 19:26:55 +0530 Message-ID: <1472219823-29486-18-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472219823-29486-1-git-send-email-shreyansh.jain@nxp.com> References: <1466510566-9240-1-git-send-email-shreyansh.jain@nxp.com> <1472219823-29486-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131166934906979649; (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)(81156014)(2351001)(97736004)(105606002)(50466002)(86362001)(2950100001)(356003)(106466001)(92566002)(87936001)(5660300001)(50986999)(8676002)(68736007)(575784001)(626004)(81166006)(77096005)(36756003)(229853001)(76176999)(48376002)(85426001)(11100500001)(8936002)(104016004)(33646002)(8666005)(4326007)(189998001)(19580395003)(19580405001)(110136002)(5890100001)(7846002)(305945005)(50226002)(5003940100001)(47776003)(2906002)(586003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB1874; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD059; 1:SENof5AVkugS5Fu88m3+I+ElhnFt/8Iy7EyOYpDpmys5b3IM5EA9UsJzfrvmSbSbMFNOY8CUhbzlzJc5DRBXdDSc48Rnk/5k7VkOmoSqcMwHE/bYCOvCqg2cYRIhsKM7Iqn5UY9tHnahcBr4JvAfX5C+1IZXG56U2YyPdMJSSDXNCb8MGJ9m7xwnuHFGHEXaMpiOSqSeBY8HZ+ykD3XopLpJywwHdQtlTCvpMmxxDX+X2XtB3UoKSexTyZn8hVpjIzGIjl2sN8UzTBbIcQoTWj7BtbyLlVLEgqHIJRBb1LH2tIEZ8d4Dp3X8lzwm3t9Mh/4x81b9CSP+gNQNnPRutNxHs6mjbj1tcX/3LpBwWA1iYt0+Ffl/V903eOONj8w5q9hSX0WPKCtvww2v853NmCjtd9TI/VKTag6o2jlVWKoh+npcDdf9x+KaSKYxHPKVkHzjw7jcL4tkl9bHmRWPpm6vMMUqiipplpHJwEWRLeXQ4so9ss/sG0LYLwkUslE1jbGLvUZqxFRG+wnjJa/F9jet2WaXzQMLcdyM3d2oa02q53ZvkD+wZQZNfYNwlKtAVoKH0nI0ZcLZsc4I5UIcbCps5y9XpZP26E8Q8DfX2vCzFC6UzLJVzMFRfs35YfsDIdJ6neT1ckXtn7KT+kzgidDHqOEqTNKHFiFMh4+70Qv7SRvMaijKzhuf+1sDuAuGp6LFQi3b5Q082aY/M7LxEmGtRl3iE/YEg3iPnG6uPJw= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 458510a1-2744-4a85-e3e0-08d3cdb903dc X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1874; 2:HaILuYBKVxUBE6X4igXDFp1C3omBs6AXMyqQYs+NHGMslg7CuAjfjk/IqGwpq/jZ9amsUIRaHDXts0P/YOrnEqBlnR+nLaK5Vlg42DypSplCsTUu8t6JDY6grBm/rPxqivqnDAYVTnZ2WgNRIZ99odg72UrR76kQ1H6dwyltkjODfeQEQ+wYpzEZU7xExJxq; 3:WLA2iHClU7Or2KRgxNCdr4Vb8sb8FiAAkkST/qKeTA/w/YV3gDrFsA9q86axbBabAxZgqUZ5f/rcgQ7eCb2n9YkeEMPbjIvxzglAaRVHkHfiQBrAG7tU4lPeMDea1SEiCBPsdqcC6dkG3vWKSarCsXjIChQxvB3CrT80wKCtxDaP0iNUsMPmEjDBN/NkObwm4o8GOATjN8gFvQvEQT2g/aRBzpXFPZM7HQI8buCB3fU=; 25:Kmq5kxS3cygZ5/L0AO+Ck0yGdDJVv+qoDe3l3/Zn0ldg3dLrQtiR48jDnBC/DfL1fqU6VOhqXF+dMkqn1RU2q4jJ5Orut5Bg4Mi3AyFXhM2KeH5syXqn9Ge1umvjL0SpnmLAKPwaKcTc0pGr09US7epCMZ6hW4rg+VB0fTIPu1Mh+vWO7s7wqUDsjML18FxVErpkb1jRb1n7HANovxyQWeDo9iv6PTd/yHHtMsvrshwynX9EzlGewKxFeLKBClraNabtDDqor1ZleMXj4NqPEkSoqn0CtNHcGu+LBHW9E9QhDYU0cgx6TYLCy38PXpDlDMrCQgd3b/M6HyIpKHRZHw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB1874; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(8121501046)(13024025)(13023025)(5005006)(13015025)(13017025)(3002001)(10201501046)(6055026); SRVR:BL2PR03MB1874; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB1874; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1874; 4:YHgM0PpEhe+kWFGZg7hr1/J9Wob1ANep7GMYCIfffrk6tP8twBgpQE8exZ7QOOl4ZV6Wpqqq6iYOlW36b6uL9+V493bkJmaqCu08X0xtWeMoHurW5/0MVpC9G+gaQyuOfdiFGngV7wEMXM8Wv0SAxvCpDWUnHUh/UNs/VG/z/3GnCOY7Eo4S/TfXDJyUpKOB+FPpDXA98Mi6Q0pBoQS3t5In+ffI0XW356mfmrtUiBzrfHxojnngJ7mXulEdzrgETWIOwiryZE6Y/kKlY+t4Dxe6CjQu8dcawVsepuxBdAywkTg+69U1cifdkY0yjEjZsHQSe5ShH7KnmpJR0uJXZU3vy6wAN83w7H6CALnUpYHJZZhU2l0XTShmVEdOxeag+pERt6xMAs1D4fZTcf+UOuZDLotgZSnfTyTwRIl3HrQZdHt2l7kAOv+Zkb6fmaqc6zji8lYoyyIlSVgIeW2xxvypuhAri9eJ4IXo2f/8J9Bs9d08mxm7Kn4LjRNgYdfB5Rkyxa5ju4K7bLYmGEViQQ== X-Forefront-PRVS: 00462943DE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB1874; 23:kbEnWy1X8kvLoaRgYgxCAYtCm0D79gKL8OY1RPIdo?= =?us-ascii?Q?35mfRaO5Pu5hyXmnLfkWvnE8JsVuz9pRpDG/PqZmHl6YDjH3gCUctZ9TJMEe?= =?us-ascii?Q?cjT+r0uF3idaXudXZVQJtjbiVlT9Hca1B7EqFUcXoPBuPiapIwqpiuFNIbtI?= =?us-ascii?Q?u290FsqRN0buEoUyHSTWbg8aA0E8a0FdFjH16ZH0UwVNxX20/dCvhpXTRG6+?= =?us-ascii?Q?cJnO9k7hoVgqkwoF9SwWVrcX9yZ9DhAVdYTIVXjJRqYqXEOdMfLid74ADWCP?= =?us-ascii?Q?SlCVmH1uglDcOGLrfeHWMjYWf+0DIhjuPudLPTtLV3AnOX3HjtCzt3z5sSFA?= =?us-ascii?Q?4a3z7AHlL5hdJiyUAcudf3OZjCcHdGsbXwE+OiqevCRJzBOUekYiHC0A8hiT?= =?us-ascii?Q?nGCpUivnue2CqquJHPegiwZL8IEKx+xaVgnLGRtD32fmlhp2EUEUxYx6nE61?= =?us-ascii?Q?3Iiug78rA0kd/C02nQ0ZbgApJHyk3bLkW4z6MD2jEo8ymsTnyKvGvHpgNNh6?= =?us-ascii?Q?9k9OZ1M4kcu+FHH+5HJgdIS9p2Txe3ucTFkjGT4Hzlp0k+AZ1C08DWsAR8oD?= =?us-ascii?Q?2M10+NN6D6Wh+HFa+uADbKFVpBZ8VzOSQ4rWqzA2ChDEgOxfd+iaLSb+uMZq?= =?us-ascii?Q?uw68PuKuhkSUT5kQ0sdzsFTovLm05cZrDwv47i3/m1giPFIgEwIpD2zUxcPV?= =?us-ascii?Q?P9O9ui+KLSI9TxkxyN4JBJrpwbb1bzOojCocDVeGptD3F2ZD+Omu8U3+veyx?= =?us-ascii?Q?nzjZu4j+OKEYl+DzYou5fSH7Ih2U3TNNO05R2YZpQpSaItfD0zrrsz6NsQyZ?= =?us-ascii?Q?ajE/HlZ2YYWm+miy0xaX/8OxF3d5PyhTIJKS7oZ73GbuPxoYQb3ImFqgi6QC?= =?us-ascii?Q?t/dFY030HnUkGPlVKRhGGxNGwFiYWvCKaW6Txj8HXsZBNI7RaP7RI3E1VqRd?= =?us-ascii?Q?fxaP2aK8GcFerbSm0uOm93iCBkSL6tZhZQfyLwv3d3hj5fcYCvKbf5dNUsV4?= =?us-ascii?Q?ro9oEiG37nOq49R+Fs2TKi1/nudg2Mv89QWjExeyrr6NRhhL2u+rIaE+k1MW?= =?us-ascii?Q?edwDIyiMwrY6lIOaWEJ4YuFaW8pgcll4mtxIlmG46shp/OAJwTrPVMY9rosE?= =?us-ascii?Q?DqWciEagG5Vir66Im3vza9bkndTD+A7FKTRFu7FwTt6aUrLWJWN3LB4Fv7fL?= =?us-ascii?Q?XfHhKSJaNFeUuf7JP9FFsWnrv7gpJrLetQz/KNXYfdCuRhszXyWOWtYhxrmW?= =?us-ascii?Q?V8u8gCH9hUPVMbUAhKxR3SPvOzlu5CHLxGJ2m+U?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1874; 5:3rKKEKs+SNuKSe8GZJwk6k2bMdPVm08hwmJEDLQYEEigJItO10Vo2pTt+LcXiED0RrE41TtUv2yDevmpv2/TEhdn7NbSi8YmOQCs2fkFPN9ZNBST9MBDG0K4BiscuO1+BTWKsnbHJEhoOzIYTCF8iAARxaRsUHwOMSOREWLi72k=; 24:we1+GVQofZa8i2SpuGFAa++BF+bAx9DSlgSXS+l7iCUFC4vCoOjTZ62yEo1uQv1e0z/Ynu843c/VuSh3rp32iqAbIz+Fnvjo/lkfE2SLfOE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2016 13:58:10.5107 (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: BL2PR03MB1874 Subject: [dpdk-dev] [PATCH v8 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: Fri, 26 Aug 2016 13:58:14 -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 | 12 +++++++----- 14 files changed, 116 insertions(+), 85 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..fa00e52 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -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