From patchwork Thu Oct 6 13:54:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 16419 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 6D6D92C56; Thu, 6 Oct 2016 15:53:16 +0200 (CEST) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0071.outbound.protection.outlook.com [104.47.42.71]) by dpdk.org (Postfix) with ESMTP id 911B429CF for ; Thu, 6 Oct 2016 15:53:14 +0200 (CEST) Received: from CY1PR03CA0018.namprd03.prod.outlook.com (10.174.128.28) by BLUPR0301MB2002.namprd03.prod.outlook.com (10.164.22.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Thu, 6 Oct 2016 13:53:12 +0000 Received: from BL2FFO11OLC014.protection.gbl (2a01:111:f400:7c09::179) by CY1PR03CA0018.outlook.office365.com (2603:10b6:600::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8 via Frontend Transport; Thu, 6 Oct 2016 13:53:12 +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 BL2FFO11OLC014.mail.protection.outlook.com (10.173.160.144) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Thu, 6 Oct 2016 13:53:12 +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 u96Dr8g6029911; Thu, 6 Oct 2016 06:53:09 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Thu, 6 Oct 2016 19:24:03 +0530 Message-ID: <1475762043-24913-1-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131202355924456421; (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)(19580405001)(50226002)(5660300001)(36756003)(50986999)(8676002)(626004)(19580395003)(189998001)(81156014)(104016004)(8666005)(81166006)(356003)(68736007)(586003)(2351001)(11100500001)(105606002)(48376002)(33646002)(106466001)(50466002)(305945005)(4326007)(2906002)(6916009)(6666003)(86362001)(7846002)(110136003)(575784001)(77096005)(8936002)(87936001)(92566002)(47776003)(85426001)(5003940100001)(97736004)(229853001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB2002; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC014; 1:lILjxT+o5pkIvpoLh3LZe0vhO/imB6stFwk70Vf6zyP78DUkHH/8+C6xYD0X8AVqo5UsqQRGSn5E255n3EzRap9qxFYafOStwTPJonZ4SxQ1QjUgWTbrLh7dF0mG0p/3M0A2Z4dGH+B6AKwhOOQutR6NEfAbGtiTZFVvMKIenSgHBHWH6Gsq6ib4U+a0M5/PSQC515khpFr/ZP38ygMa2pSU47yOXm+f5FVQ3omT6+rfPbjps6xP9l0B3fPWfTLAvVQTh3JZj1uDQQ4NIyMUmsJFR/vxjCmtUFINO6H7eu/uGa6YUJYML3rz02tTcR3rF92fmx/SjMK+W+uXI3jxXzW9Q3GEtV1B1Bq8GKVFR7U4qQUuemMgiU4W49OdIFG9CDiOEzKbTrimxZfZicuXg3AeO/gQLpOQQ7z2QgHczUlD30Pd4SgN1iEAEOESghKHqQ1ryyBrXVkB6ZjewPkyo3wB95+XIPvB5gv7uvHFqNEmvZnnfr3RLffHEP9/IXwpw7zR/4aVIUaDrnb7tLGPuVmaP2yQq0kdkmkUau7IaW9xrE7PUvJH5ONRarnt2CyqxEb3KZwnsF9ms24bmmOJXsgo8Z+uh0LOjh6CUJkKu/K0tjsGckXQoToVmjG8ytt+M1A+1ObsenIDaip1HmcBV6dIboeo3bUPAmD+svEiIUruWnsKkr7Q2uX3fjycVgsldzt1fk9KcWdxhqApz8nRFdJ0bHEwO7bB31EMdL2gJOE= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: dc57a75b-4b7b-4ec6-f2a2-08d3edf01d06 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2002; 2:I7U0Zyo3kI3otr62czCKyiy45mNI52V8VhVvxzfcPrJpzz7ZsL4/W1/lajsaxqUXQYXs5JCdyBT2qmG8Lp/C91382qe/JYst6TmuFs9SaX3RHDRjJKt+0J9U1XDSlRN4ySoMSDIQ4s9TsFh7CeRQDbHQrqfyclaz+lyX8nrcctJvvTYjvN9aNZkKZbT8pZcORptQz6NvaasBI2282m2Xgw==; 3:/JiuwFp/86DjAG1mqMnsbSXWJzKOhAfKk3/I0yIg0QiWA1UEbywrBAy0zcQuuLIZiiDZV/WQfS66E/AxXxq+m7+KQGM2IaEgSZO+/Rp9HEUA2Gn8KG7PaqpRPxUpeQfFOrpJoEJdrRKN6SmjdZKufCEv1UOAuD/Xjpt02ENbTUpDCpLcCKyMpUcJtYN+RJi7LAtauxipLbDTwwIAzv/6GmKSA4BLpRFwSaAiLvEY+jvB6apCeqmgIc3PawpArL9L; 25:p/mbncPnI6GmdrYYbKJbNLv+YsQcjCpKUEIHIu2fXx6a8LpekiRZiXV2EKy3tRDBD5ZlC0w+DZouqnwU2Clq72VNyF0/3J8AXewvfmuzfU4SH4I+kwq+b0hMzIOXhJ5Iy49Cwt+KxT/l1IJnN33b3h66kTp9kNdMgxcNcUS4Uos95roe80U0/4Di+4/xW0FcIapMvbPwiXpqktXycrKELOQSkKmtQ9CAxZQqnqAz7Vt5CMIUU7/F8hkltWooilzVl9SGpKDgjcM3ggj81Ku/3qWHDDk9WRvjML2DAm8XmYHIkF08dnL2eiTD9V1Un93sJwCl5ta91LywAO+Htl0aVdck22m8brJVKG+jPf+PFigBDd9umxJ4GWm6PSMR6S297a8GYHBUHjm7wRTZx4k3Wvncx/Z2thfL6iLlft+bz6DAWOqx71jhSlntMHM1fbrq X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2002; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2002; 31:f5A2WVVk5lU0gtgmKVzmxgk6x00n8xzmVRD5p+a6+KZV1rQo+cVXp41SOvu+xi5io7QfLzJ4TgKpaILctJNeeXc7ZRbthU1iYa3wqPjZdNwtZBASwRKHmkoPYG8akVgggZrnwhJltRAfQYUn1WFre0vRdcWgZSTztzmFheC8WBXTNy7XdcPCeVmnFx1BGLAd8cQ8CYNJAwsK1y6jh1xeGREwEADCjvaUFbimtucQo5u9xrVA6Ex72tLwVr6ziSeYc6c1aO4MCAblFU8pHdS5dQ==; 4:4CKxJ7E1hcg9W2olP/NDaDGfpWJo0qS33H7o7cYAS+tBsutZRuZjgc4Vw9y5jjirqa4h1RjIbyy0RvpMxfR9y5Wm62K0AaZSlG9VDnGBLuotK9MgmqOKzBHi2aCCHQl86BcGNqv1gmDPmNUurkfefD1p96P9enPFGnzzItSU47fcgSqfUWGfajLDekg2NLTMK7pJxvkLzhEqYGuUnM3I5RKa1hWMUB8+iHA+ipSE6pcB8MudLUzT7on9PsvxBx298mbFa232b3st3Xb+54DNszMyrI30mQCmEza+VREcQnv0Rk8hSvhsedeVthzBjYICpjFIk5yYOtIklM2twJOqjNpyial4RdisGI57iQHgtA5nlEdrP+kv1MBQqjsDe4M03dLFiQoQUVwSdHKlGfK0aY+q9U90lwOrhsmCpQpSlLPygK0zb0I7U9H3B94KNdtrHvn0vh/IwEkXIIvLbLaSN6BVEx14wmPEKbNTwz8R2IUAml+m8ALJZ6NJ44hAvShyyIvjf0EgKDAyKoMfncR0Hlj3q3Yenzzk+AMM7wW7+QAf5sDzA2KwFjlLOVNFhoIi 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)(5005006)(8121501046)(13017025)(13023025)(13015025)(13018025)(13024025)(3002001)(10201501046)(6055026); SRVR:BLUPR0301MB2002; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR0301MB2002; X-Forefront-PRVS: 00872B689F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0301MB2002; 23:zS1TYDLNNrcimBbMzP9ILE7kXSBxfslZ46kfk2v?= =?us-ascii?Q?moT8BZ3iu76xOjpum+hsSdmsss78PPmr0vaRqum0nwkDcVAl2BInwtYgRVko?= =?us-ascii?Q?9Il0pWQWSOZe9iTw2G3jQPk0vHIZyNzJVD/mVC5gs+8iAlUAha1RJfseLJSN?= =?us-ascii?Q?IEKk8knBwE7fswanNvsFjx2eDA+2kG/VnCy+3Q/ooIIPQUYXb7JjbuE9V4dV?= =?us-ascii?Q?dVZvdDVMzNjhIYZts0ds8RdJaJTwqERD1GrADrkazrR4w8SrDjVPzHWoaoxd?= =?us-ascii?Q?6AJcHsknwABUMpaTvYCR+ouJcaRAWXOncacMwYCdU0suv5LZ0dYj3w2SS7Zd?= =?us-ascii?Q?ZyC+RogM4kQ8H7xIrWVCrJ1wDI950XHmErCCM46N4DWTt52O3d3pXr8gZnMm?= =?us-ascii?Q?rX+6GxSGKkrFArfXKwunyyoBRYDWHwGdx1GOKFsT8I0150Iwkr2KmXQZ5p80?= =?us-ascii?Q?ALhrX0dglOlHE0J+qGlexNXUJUVNJ0DoUY8ELUHH79ucPwh67Pcw0wi7iAm2?= =?us-ascii?Q?m7sidmK+G8MNJJAxpDoTYnSbauJm4GvphkozB2gJSNUVKNlx5YVVhJ98twWX?= =?us-ascii?Q?0AxqRqOJNJFJ6Q+u9hXXjGB53LZsY96ycderGqwZfZt4NJjBUIMjTpAv8ulx?= =?us-ascii?Q?walG2jrhLL4JbTPBtnxJGslzxFvQOHlFMZIBYjq84Kb6ZQvs1i5vpNbeBqGz?= =?us-ascii?Q?jFxf6XQRjbTTgnxUGXLgyMf+hR93ByZ/Prcc7RV2qxo+mbd2fcpHB8CJ5Hyq?= =?us-ascii?Q?lxkg83l9/7GkkHSCSJhhzUPzISqCyBqFYKJdrHFvTMi7eWSf6nMXkg42Gva2?= =?us-ascii?Q?JZYavtPK+Iz5D5h6BP2NZ3qXjjoC4+dqUofvaENyQR/Ux+GcD2Uc21ySJy3D?= =?us-ascii?Q?1ec9/Hy9a76tphmsEpMtvfCPNld0P+eKJs4saKWovkjv05c9RYQpg0vNixvq?= =?us-ascii?Q?XTNOrqETpzRQmMLOglKwSQSU7SwlyEGfseDNJBeOMtV6oq9YvO0t6oBIxTXg?= =?us-ascii?Q?LzTODSF8XHr4H/xZjm8fQWW7WrMN12yTHCKdOnNjSOidJcZG5X2uSFivbIfp?= =?us-ascii?Q?aTF530k3YqQEdM8WHjJaVzYSbpAmf4TRVjXwFZkH/N+pIT6194UTx6hPIa7d?= =?us-ascii?Q?faZrc2aDetFC+dBbne11xC2e9OhE1bTmhMVHnldzUDLFci2ptPdUz9fPPD0d?= =?us-ascii?Q?/eLQMkDV3W9Ybcks=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2002; 6:VIKDAetYoRhCHSr2uVDCs9JJ+CuGirMSTYcvg8x+9cCYqtdFEkhPrb86rOHyQ5cNozsbHe0B8Q8fUBGiQzmpnXPhy1AgA1aTunW9B+rY5oYjQRi8E/xdjBO+TbQZP/fcTKNoSwVaQmHpjTRQGt4I05dLzF1fzSpJ1N23OFHbAM8jrkmJiFJjYNXHweOVMgGejfG1//DicWi7p2kZ4/q9HO4gHba5e3bYWAMASH5G0zvJxQJFLSs/KYT40mB0DY36Ag+1nwWwoGCP+ggJkTEcL0cJeIIynDXbFyv5wuMFSagdtfdOuNjq5S1GdU9GNUXR; 5:5lwy5qwNiP4NyGpoe5oA2xkC6RL6uQL9q+dkjsc3WRKpi4eewCvxhTDCOiRRla4M9y/mgocVKSqlC9su7L49bopnwLzXw0zufhv7V6hiQPv9bPbjoDIzxCqp+bZmEZGxjFmlQkPmYxPbABNGPbNefN/4U3tXblNu5VZAQowq+MHFuArpkOcUJHVH1qXjmllN; 24:5C4/lF8T+OS/qe38duw0CF3LL25FZKlbXy7g92gaAfv9qFrZzFixPImxzaTqjCC8plu62zf8hi0aO3K8oOpfgQ5gIELp/gNGzBgmOcaYSEA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2002; 7:ZYGAERrwPJYloWBaAnKrhfnM5lTcb98DkITXf08/fMdKrBAXhkHUTRWlft8ctA94xdcrdV+nwj88aXCiOorF2ekYFmwGcmoRsp0DvJBpHt+d6SH/QTVlkVpWFKcH0mAp3SvPHRW1Pb+dhaaJqgX6iP8hdTVdjiViE0lDhog4a7xJHQG5rLJgx2vxdJLQH/5xfBYMyrNAWw/DDVIC+1QQKePdp0K4vdevEteBYX5xkQb+lHf7T7975oixQx1grPyzVxkYlYDCusAo8iOV5cCsz4BlL2mVHZZfreS4PMG5UvW595RHwxNnd31UTYRH99YrFgO1w36dv2xt2I7OZUM5SA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2016 13:53:12.2584 (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: BLUPR0301MB2002 Subject: [dpdk-dev] [PATCH] eal/vdev: rename vdev driver init/uninit to probe/remove 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" Inline with PCI probe and remove, VDEV probe and remove hooks provide a uniform naming. PCI probe represents scan and driver initialization. For VDEV, it will represent argument parsing and initialization. Signed-off-by: Shreyansh Jain --- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 12 ++++++------ drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 12 ++++++------ drivers/crypto/kasumi/rte_kasumi_pmd.c | 12 ++++++------ drivers/crypto/null/null_crypto_pmd.c | 12 ++++++------ drivers/crypto/snow3g/rte_snow3g_pmd.c | 12 ++++++------ drivers/net/af_packet/rte_eth_af_packet.c | 8 ++++---- drivers/net/bonding/rte_eth_bond_pmd.c | 8 ++++---- drivers/net/mpipe/mpipe_tilegx.c | 6 +++--- drivers/net/null/rte_eth_null.c | 8 ++++---- drivers/net/pcap/rte_eth_pcap.c | 8 ++++---- drivers/net/ring/rte_eth_ring.c | 8 ++++---- drivers/net/vhost/rte_eth_vhost.c | 8 ++++---- drivers/net/virtio/virtio_user_ethdev.c | 8 ++++---- drivers/net/xenvirt/rte_eth_xenvirt.c | 8 ++++---- lib/librte_eal/common/eal_common_vdev.c | 4 ++-- lib/librte_eal/common/include/rte_vdev.h | 14 +++++++------- 16 files changed, 74 insertions(+), 74 deletions(-) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index fc939fa..317c556 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -395,7 +395,7 @@ aesni_gcm_pmd_dequeue_burst(void *queue_pair, return nb_dequeued; } -static int aesni_gcm_uninit(const char *name); +static int aesni_gcm_remove(const char *name); static int aesni_gcm_create(const char *name, @@ -477,12 +477,12 @@ aesni_gcm_create(const char *name, init_error: GCM_LOG_ERR("driver %s: create failed", name); - aesni_gcm_uninit(crypto_dev_name); + aesni_gcm_remove(crypto_dev_name); return -EFAULT; } static int -aesni_gcm_init(const char *name, const char *input_args) +aesni_gcm_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS, @@ -503,7 +503,7 @@ aesni_gcm_init(const char *name, const char *input_args) } static int -aesni_gcm_uninit(const char *name) +aesni_gcm_remove(const char *name) { if (name == NULL) return -EINVAL; @@ -515,8 +515,8 @@ aesni_gcm_uninit(const char *name) } static struct rte_vdev_driver aesni_gcm_pmd_drv = { - .init = aesni_gcm_init, - .uninit = aesni_gcm_uninit + .probe = aesni_gcm_probe, + .remove = aesni_gcm_remove }; DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD, aesni_gcm_pmd_drv); diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 2047269..ff2fc25 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -595,7 +595,7 @@ aesni_mb_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, } -static int cryptodev_aesni_mb_uninit(const char *name); +static int cryptodev_aesni_mb_remove(const char *name); static int cryptodev_aesni_mb_create(const char *name, @@ -675,13 +675,13 @@ cryptodev_aesni_mb_create(const char *name, init_error: MB_LOG_ERR("driver %s: cryptodev_aesni_create failed", name); - cryptodev_aesni_mb_uninit(crypto_dev_name); + cryptodev_aesni_mb_remove(crypto_dev_name); return -EFAULT; } static int -cryptodev_aesni_mb_init(const char *name, +cryptodev_aesni_mb_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { @@ -703,7 +703,7 @@ cryptodev_aesni_mb_init(const char *name, } static int -cryptodev_aesni_mb_uninit(const char *name) +cryptodev_aesni_mb_remove(const char *name) { if (name == NULL) return -EINVAL; @@ -715,8 +715,8 @@ cryptodev_aesni_mb_uninit(const char *name) } static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = { - .init = cryptodev_aesni_mb_init, - .uninit = cryptodev_aesni_mb_uninit + .probe = cryptodev_aesni_mb_probe, + .remove = cryptodev_aesni_mb_remove }; DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD, cryptodev_aesni_mb_pmd_drv); diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index d1b0b99..8774fc2 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -556,7 +556,7 @@ kasumi_pmd_dequeue_burst(void *queue_pair, return nb_dequeued; } -static int cryptodev_kasumi_uninit(const char *name); +static int cryptodev_kasumi_remove(const char *name); static int cryptodev_kasumi_create(const char *name, @@ -611,12 +611,12 @@ cryptodev_kasumi_create(const char *name, init_error: KASUMI_LOG_ERR("driver %s: cryptodev_kasumi_create failed", name); - cryptodev_kasumi_uninit(crypto_dev_name); + cryptodev_kasumi_remove(crypto_dev_name); return -EFAULT; } static int -cryptodev_kasumi_init(const char *name, +cryptodev_kasumi_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { @@ -638,7 +638,7 @@ cryptodev_kasumi_init(const char *name, } static int -cryptodev_kasumi_uninit(const char *name) +cryptodev_kasumi_remove(const char *name) { if (name == NULL) return -EINVAL; @@ -651,8 +651,8 @@ cryptodev_kasumi_uninit(const char *name) } static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = { - .init = cryptodev_kasumi_init, - .uninit = cryptodev_kasumi_uninit + .probe = cryptodev_kasumi_probe, + .remove = cryptodev_kasumi_remove }; DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv); diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index bd139b4..e41e819 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -182,7 +182,7 @@ null_crypto_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, return nb_dequeued; } -static int cryptodev_null_uninit(const char *name); +static int cryptodev_null_remove(const char *name); /** Create crypto device */ static int @@ -227,14 +227,14 @@ cryptodev_null_create(const char *name, init_error: NULL_CRYPTO_LOG_ERR("driver %s: cryptodev_null_create failed", name); - cryptodev_null_uninit(crypto_dev_name); + cryptodev_null_remove(crypto_dev_name); return -EFAULT; } /** Initialise null crypto device */ static int -cryptodev_null_init(const char *name, +cryptodev_null_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { @@ -257,7 +257,7 @@ cryptodev_null_init(const char *name, /** Uninitialise null crypto device */ static int -cryptodev_null_uninit(const char *name) +cryptodev_null_remove(const char *name) { if (name == NULL) return -EINVAL; @@ -269,8 +269,8 @@ cryptodev_null_uninit(const char *name) } static struct rte_vdev_driver cryptodev_null_pmd_drv = { - .init = cryptodev_null_init, - .uninit = cryptodev_null_uninit + .probe = cryptodev_null_probe, + .remove = cryptodev_null_remove }; DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv); diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index c46d7e5..f4b596e 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -545,7 +545,7 @@ snow3g_pmd_dequeue_burst(void *queue_pair, return nb_dequeued; } -static int cryptodev_snow3g_uninit(const char *name); +static int cryptodev_snow3g_remove(const char *name); static int cryptodev_snow3g_create(const char *name, @@ -599,12 +599,12 @@ cryptodev_snow3g_create(const char *name, init_error: SNOW3G_LOG_ERR("driver %s: cryptodev_snow3g_create failed", name); - cryptodev_snow3g_uninit(crypto_dev_name); + cryptodev_snow3g_remove(crypto_dev_name); return -EFAULT; } static int -cryptodev_snow3g_init(const char *name, +cryptodev_snow3g_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { @@ -626,7 +626,7 @@ cryptodev_snow3g_init(const char *name, } static int -cryptodev_snow3g_uninit(const char *name) +cryptodev_snow3g_remove(const char *name) { if (name == NULL) return -EINVAL; @@ -639,8 +639,8 @@ cryptodev_snow3g_uninit(const char *name) } static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = { - .init = cryptodev_snow3g_init, - .uninit = cryptodev_snow3g_uninit + .probe = cryptodev_snow3g_probe, + .remove = cryptodev_snow3g_remove }; DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv); diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 5f48ead..6777c41 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -820,7 +820,7 @@ rte_eth_from_packet(const char *name, } static int -rte_pmd_af_packet_devinit(const char *name, const char *params) +rte_pmd_af_packet_probe(const char *name, const char *params) { unsigned numa_node; int ret = 0; @@ -858,7 +858,7 @@ exit: } static int -rte_pmd_af_packet_devuninit(const char *name) +rte_pmd_af_packet_remove(const char *name) { struct rte_eth_dev *eth_dev = NULL; struct pmd_internals *internals; @@ -890,8 +890,8 @@ rte_pmd_af_packet_devuninit(const char *name) } static struct rte_vdev_driver pmd_af_packet_drv = { - .init = rte_pmd_af_packet_devinit, - .uninit = rte_pmd_af_packet_devuninit, + .probe = rte_pmd_af_packet_probe, + .remove = rte_pmd_af_packet_remove, }; DRIVER_REGISTER_VDEV(net_af_packet, pmd_af_packet_drv); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 9202481..970fe0c 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2177,7 +2177,7 @@ const struct eth_dev_ops default_dev_ops = { }; static int -bond_init(const char *name, const char *params) +bond_probe(const char *name, const char *params) { struct bond_dev_private *internals; struct rte_kvargs *kvlist; @@ -2244,7 +2244,7 @@ parse_error: } static int -bond_uninit(const char *name) +bond_remove(const char *name) { int ret; @@ -2509,8 +2509,8 @@ bond_ethdev_configure(struct rte_eth_dev *dev) } static struct rte_vdev_driver bond_drv = { - .init = bond_init, - .uninit = bond_uninit, + .probe = bond_probe, + .remove = bond_remove, }; DRIVER_REGISTER_VDEV(net_bonding, bond_drv); diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c index 5b2e8cd..b9eefdf 100644 --- a/drivers/net/mpipe/mpipe_tilegx.c +++ b/drivers/net/mpipe/mpipe_tilegx.c @@ -1549,7 +1549,7 @@ mpipe_link_mac(const char *ifname, uint8_t *mac) } static int -rte_pmd_mpipe_devinit(const char *ifname, +rte_pmd_mpipe_probe(const char *ifname, const char *params __rte_unused) { gxio_mpipe_context_t *context; @@ -1624,11 +1624,11 @@ rte_pmd_mpipe_devinit(const char *ifname, } static struct rte_vdev_driver pmd_mpipe_xgbe_drv = { - .init = rte_pmd_mpipe_devinit, + .probe = rte_pmd_mpipe_probe, }; static struct rte_vdev_driver pmd_mpipe_gbe_drv = { - .init = rte_pmd_mpipe_devinit, + .probe = rte_pmd_mpipe_probe, }; DRIVER_REGISTER_VDEV(net_mpipe_xgbe, pmd_mpipe_xgbe_drv); diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 2adc43e..c2e10a8 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -611,7 +611,7 @@ get_packet_copy_arg(const char *key __rte_unused, } static int -rte_pmd_null_devinit(const char *name, const char *params) +rte_pmd_null_probe(const char *name, const char *params) { unsigned numa_node; unsigned packet_size = default_packet_size; @@ -663,7 +663,7 @@ free_kvlist: } static int -rte_pmd_null_devuninit(const char *name) +rte_pmd_null_remove(const char *name) { struct rte_eth_dev *eth_dev = NULL; @@ -687,8 +687,8 @@ rte_pmd_null_devuninit(const char *name) } static struct rte_vdev_driver pmd_null_drv = { - .init = rte_pmd_null_devinit, - .uninit = rte_pmd_null_devuninit, + .probe = rte_pmd_null_probe, + .remove = rte_pmd_null_remove, }; DRIVER_REGISTER_VDEV(net_null, pmd_null_drv); diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 51ef86f..965c999 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -937,7 +937,7 @@ eth_from_pcaps(const char *name, struct pmd_devargs *rx_queues, } static int -pmd_pcap_devinit(const char *name, const char *params) +pmd_pcap_probe(const char *name, const char *params) { unsigned int is_rx_pcap = 0, is_tx_pcap = 0; struct rte_kvargs *kvlist; @@ -1036,7 +1036,7 @@ free_kvlist: } static int -pmd_pcap_devuninit(const char *name) +pmd_pcap_remove(const char *name) { struct rte_eth_dev *eth_dev = NULL; @@ -1060,8 +1060,8 @@ pmd_pcap_devuninit(const char *name) } static struct rte_vdev_driver pmd_pcap_drv = { - .init = pmd_pcap_devinit, - .uninit = pmd_pcap_devuninit, + .probe = pmd_pcap_probe, + .remove = pmd_pcap_remove, }; DRIVER_REGISTER_VDEV(net_pcap, pmd_pcap_drv); diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index ee435c1..b91f222 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -505,7 +505,7 @@ out: } static int -rte_pmd_ring_devinit(const char *name, const char *params) +rte_pmd_ring_probe(const char *name, const char *params) { struct rte_kvargs *kvlist = NULL; int ret = 0; @@ -580,7 +580,7 @@ out_free: } static int -rte_pmd_ring_devuninit(const char *name) +rte_pmd_ring_remove(const char *name) { struct rte_eth_dev *eth_dev = NULL; struct pmd_internals *internals = NULL; @@ -624,8 +624,8 @@ rte_pmd_ring_devuninit(const char *name) } static struct rte_vdev_driver pmd_ring_drv = { - .init = rte_pmd_ring_devinit, - .uninit = rte_pmd_ring_devuninit, + .probe = rte_pmd_ring_probe, + .remove = rte_pmd_ring_remove, }; DRIVER_REGISTER_VDEV(net_ring, pmd_ring_drv); diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 409e090..c1d09a0 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1124,7 +1124,7 @@ open_int(const char *key __rte_unused, const char *value, void *extra_args) } static int -rte_pmd_vhost_devinit(const char *name, const char *params) +rte_pmd_vhost_probe(const char *name, const char *params) { struct rte_kvargs *kvlist = NULL; int ret = 0; @@ -1176,7 +1176,7 @@ out_free: } static int -rte_pmd_vhost_devuninit(const char *name) +rte_pmd_vhost_remove(const char *name) { struct rte_eth_dev *eth_dev = NULL; struct pmd_internal *internal; @@ -1226,8 +1226,8 @@ rte_pmd_vhost_devuninit(const char *name) } static struct rte_vdev_driver pmd_vhost_drv = { - .init = rte_pmd_vhost_devinit, - .uninit = rte_pmd_vhost_devuninit, + .probe = rte_pmd_vhost_probe, + .remove = rte_pmd_vhost_remove, }; DRIVER_REGISTER_VDEV(net_vhost, pmd_vhost_drv); diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index a52a140..6fcedd9 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -331,7 +331,7 @@ virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev) * Returns 0 on success. */ static int -virtio_user_pmd_devinit(const char *name, const char *params) +virtio_user_pmd_probe(const char *name, const char *params) { struct rte_kvargs *kvlist = NULL; struct rte_eth_dev *eth_dev; @@ -445,7 +445,7 @@ end: /** Called by rte_eth_dev_detach() */ static int -virtio_user_pmd_devuninit(const char *name) +virtio_user_pmd_remove(const char *name) { struct rte_eth_dev *eth_dev; struct virtio_hw *hw; @@ -474,8 +474,8 @@ virtio_user_pmd_devuninit(const char *name) } static struct rte_vdev_driver virtio_user_driver = { - .init = virtio_user_pmd_devinit, - .uninit = virtio_user_pmd_devuninit, + .probe = virtio_user_pmd_probe, + .remove = virtio_user_pmd_remove, }; DRIVER_REGISTER_VDEV(net_virtio_user, virtio_user_driver); diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index 4ade78c..fa01ba0 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -729,7 +729,7 @@ eth_dev_xenvirt_free(const char *name, const unsigned numa_node) /*TODO: Support multiple process model */ static int -rte_pmd_xenvirt_devinit(const char *name, const char *params) +rte_pmd_xenvirt_probe(const char *name, const char *params) { if (virtio_idx == 0) { if (xenstore_init() != 0) { @@ -746,7 +746,7 @@ rte_pmd_xenvirt_devinit(const char *name, const char *params) } static int -rte_pmd_xenvirt_devuninit(const char *name) +rte_pmd_xenvirt_remove(const char *name) { eth_dev_xenvirt_free(name, rte_socket_id()); @@ -760,8 +760,8 @@ rte_pmd_xenvirt_devuninit(const char *name) } static struct rte_vdev_driver pmd_xenvirt_drv = { - .init = rte_pmd_xenvirt_devinit, - .uninit = rte_pmd_xenvirt_devuninit, + .probe = rte_pmd_xenvirt_probe, + .remove = rte_pmd_xenvirt_remove, }; DRIVER_REGISTER_VDEV(net_xenvirt, pmd_xenvirt_drv); diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c index 6dab782..0434390 100644 --- a/lib/librte_eal/common/eal_common_vdev.c +++ b/lib/librte_eal/common/eal_common_vdev.c @@ -76,7 +76,7 @@ rte_eal_vdev_init(const char *name, const char *args) */ if (!strncmp(driver->driver.name, name, strlen(driver->driver.name))) - return driver->init(name, args); + return driver->probe(name, args); } RTE_LOG(ERR, EAL, "no driver found for %s\n", name); @@ -100,7 +100,7 @@ rte_eal_vdev_uninit(const char *name) */ if (!strncmp(driver->driver.name, name, strlen(driver->driver.name))) - return driver->uninit(name); + return driver->remove(name); } RTE_LOG(ERR, EAL, "no driver found for %s\n", name); diff --git a/lib/librte_eal/common/include/rte_vdev.h b/lib/librte_eal/common/include/rte_vdev.h index 1e6b338..0dec8eb 100644 --- a/lib/librte_eal/common/include/rte_vdev.h +++ b/lib/librte_eal/common/include/rte_vdev.h @@ -44,23 +44,23 @@ extern "C" { TAILQ_HEAD(vdev_driver_list, rte_vdev_driver); /** - * Initialization function called for each virtual device driver once. + * Probe function called for each virtual device driver once. */ -typedef int (rte_vdev_init_t)(const char *name, const char *args); +typedef int (rte_vdev_probe_t)(const char *name, const char *args); /** - * Uninitilization function called for each virtual device driver once. + * Remove function called for each virtual device driver once. */ -typedef int (rte_vdev_uninit_t)(const char *name); +typedef int (rte_vdev_remove_t)(const char *name); /** * A virtual device driver abstraction. */ struct rte_vdev_driver { TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */ - struct rte_driver driver; /**< Inherited general driver. */ - rte_vdev_init_t *init; /**< Virtual device init. function. */ - rte_vdev_uninit_t *uninit; /**< Virtual device uninit. function. */ + struct rte_driver driver; /**< Inherited general driver. */ + rte_vdev_probe_t *probe; /**< Virtual device probe function. */ + rte_vdev_remove_t *remove; /**< Virtual device remove function. */ }; /**