Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/113883/?format=api
{ "id": 113883, "url": "https://patches.dpdk.org/api/patches/113883/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220709082644.664675-28-david.marchand@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220709082644.664675-28-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220709082644.664675-28-david.marchand@redhat.com", "date": "2022-07-09T08:26:42", "name": "[RFC,v2,v2,27/29] dev: hide driver object", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "198671d439e0daa7b02730bff4563733e95ef44e", "submitter": { "id": 1173, "url": "https://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220709082644.664675-28-david.marchand@redhat.com/mbox/", "series": [ { "id": 23949, "url": "https://patches.dpdk.org/api/series/23949/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=23949", "date": "2022-07-09T08:26:16", "name": "Bus and device cleanup for 22.11", "version": 2, "mbox": "https://patches.dpdk.org/series/23949/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/113883/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/113883/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4322AA00C5;\n\tSat, 9 Jul 2022 10:29:56 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2FF884282E;\n\tSat, 9 Jul 2022 10:29:56 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by mails.dpdk.org (Postfix) with ESMTP id BC52B42B72\n for <dev@dpdk.org>; Sat, 9 Jul 2022 10:29:54 +0200 (CEST)", "from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com\n [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-381-5DwFjSu1PruI6dWxGjCgjw-1; Sat, 09 Jul 2022 04:29:49 -0400", "from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A32B3806737;\n Sat, 9 Jul 2022 08:29:47 +0000 (UTC)", "from localhost.localdomain (unknown [10.40.192.194])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 2F1BD2026D64;\n Sat, 9 Jul 2022 08:29:35 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1657355394;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=aC3aIG71Cv3mOQ2cn3qF/J5dnl3y5SrwJkXV7wp/7vU=;\n b=M2HReR1ID/5k7Xlxadf2b8PyLFOGkRlrR7N+LPkAum9d6eBTebm9w9HQsdL03Pksv2qQbv\n uLR7ak/FcUM1B+p7seQt7JeCJIqEPh0/dQwNJx+Fpi76T0rv0pnGm66yVNHMry5p8eTp5I\n M8A7mFyDd9hc1Nk7QIGuPBPC7pNF3tw=", "X-MC-Unique": "5DwFjSu1PruI6dWxGjCgjw-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "Nicolas Chautru <nicolas.chautru@intel.com>,\n Parav Pandit <parav@nvidia.com>, Xueming Li <xuemingl@nvidia.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>, Rosen Xu <rosen.xu@intel.com>,\n Stephen Hemminger <sthemmin@microsoft.com>, Long Li <longli@microsoft.com>,\n Fan Zhang <roy.fan.zhang@intel.com>, Sunila Sahu <ssahu@marvell.com>,\n Ashish Gupta <ashish.gupta@marvell.com>,\n Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>,\n Vikas Gupta <vikas.gupta@broadcom.com>,\n Chandubabu Namburu <chandu@amd.com>, Ankur Dwivedi <adwivedi@marvell.com>,\n Anoob Joseph <anoobj@marvell.com>, Tejasree Kondoj <ktejasree@marvell.com>,\n Gagandeep Singh <g.singh@nxp.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Kevin Laatz <kevin.laatz@intel.com>,\n Timothy McDaniel <timothy.mcdaniel@intel.com>,\n Jerin Jacob <jerinj@marvell.com>, Elena Agostini <eagostini@nvidia.com>,\n Ciara Loftus <ciara.loftus@intel.com>, Qi Zhang <qi.z.zhang@intel.com>,\n Shepard Siegel <shepard.siegel@atomicrules.com>,\n Ed Czeck <ed.czeck@atomicrules.com>,\n John Miller <john.miller@atomicrules.com>,\n Steven Webster <steven.webster@windriver.com>,\n Matt Peters <matt.peters@windriver.com>, Rasesh Mody <rmody@marvell.com>,\n Shahed Shaikh <shshaikh@marvell.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,\n Simei Su <simei.su@intel.com>, Wenjun Wu <wenjun1.wu@intel.com>,\n Marcin Wojtas <mw@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,\n Shai Brandes <shaibran@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>,\n Igor Chauskin <igorch@amazon.com>, John Daley <johndale@cisco.com>,\n Hyong Youb Kim <hyonkim@cisco.com>, Gaetan Rivet <grive@u256.net>,\n Xiao Wang <xiao.w.wang@intel.com>, Yuying Zhang <Yuying.Zhang@intel.com>,\n Beilei Xing <beilei.xing@intel.com>, Jingjing Wu <jingjing.wu@intel.com>,\n Qiming Yang <qiming.yang@intel.com>, Matan Azrad <matan@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Chaoyong He <chaoyong.he@corigine.com>,\n Niklas Soderlund <niklas.soderlund@corigine.com>,\n Harman Kalra <hkalra@marvell.com>,\n Devendra Singh Rawat <dsinghrawat@marvell.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Maciej Czekaj <mczekaj@marvell.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Chenbo Xia <chenbo.xia@intel.com>, Jochen Behrens <jbehrens@vmware.com>,\n Jakub Palider <jpalider@marvell.com>,\n Tomasz Duszynski <tduszynski@marvell.com>, Ori Kam <orika@nvidia.com>,\n Akhil Goyal <gakhil@marvell.com>, Chengwen Feng <fengchengwen@huawei.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Ferruh Yigit <ferruh.yigit@xilinx.com>,\n Abhinandan Gujjar <abhinandan.gujjar@intel.com>,\n Jay Jayatheerthan <jay.jayatheerthan@intel.com>,\n Olivier Matz <olivier.matz@6wind.com>,\n Reshma Pattan <reshma.pattan@intel.com>", "Subject": "[RFC v2 v2 27/29] dev: hide driver object", "Date": "Sat, 9 Jul 2022 10:26:42 +0200", "Message-Id": "<20220709082644.664675-28-david.marchand@redhat.com>", "In-Reply-To": "<20220709082644.664675-1-david.marchand@redhat.com>", "References": "<20220628144643.1213026-1-david.marchand@redhat.com>\n <20220709082644.664675-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.78 on 10.11.54.4", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Make rte_driver opaque for non internal users.\nThis will make extending this object possible without breaking the ABI.\n\nIntroduce a new driver header and move rte_driver definition.\nUpdate drivers and library to use the internal header.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/baseband/acc100/rte_acc100_pmd.c | 2 +-\n .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 2 +-\n drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 2 +-\n drivers/bus/auxiliary/auxiliary_params.c | 2 +-\n drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +-\n drivers/bus/dpaa/bus_dpaa_driver.h | 2 ++\n drivers/bus/fslmc/bus_fslmc_driver.h | 2 +-\n drivers/bus/fslmc/fslmc_vfio.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +-\n drivers/bus/ifpga/bus_ifpga_driver.h | 1 +\n drivers/bus/pci/bus_pci_driver.h | 2 +-\n drivers/bus/pci/pci_params.c | 2 +-\n drivers/bus/vdev/bus_vdev_driver.h | 2 +-\n drivers/bus/vdev/vdev.c | 2 +-\n drivers/bus/vdev/vdev_params.c | 2 +-\n drivers/bus/vmbus/bus_vmbus_driver.h | 2 +-\n drivers/common/qat/dev/qat_dev_gen4.c | 2 +-\n drivers/common/qat/qat_qp.c | 2 +-\n drivers/compress/zlib/zlib_pmd_ops.c | 2 +-\n drivers/crypto/bcmfs/bcmfs_qp.c | 2 +-\n drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 2 +-\n drivers/crypto/ccp/rte_ccp_pmd.c | 2 +-\n drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +-\n drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-\n drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +-\n drivers/crypto/scheduler/scheduler_pmd_ops.c | 2 +-\n drivers/dma/idxd/idxd_bus.c | 1 +\n drivers/event/dlb2/dlb2.c | 2 +-\n drivers/event/dlb2/pf/dlb2_pf.c | 2 +-\n drivers/event/dpaa/dpaa_eventdev.c | 2 +-\n drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-\n drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +-\n drivers/event/octeontx/ssovf_evdev.c | 2 +-\n drivers/event/skeleton/skeleton_eventdev.c | 2 +-\n drivers/gpu/cuda/cuda.c | 2 +-\n drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 2 +-\n drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-\n drivers/net/ark/ark_global.h | 2 +-\n drivers/net/avp/avp_ethdev.c | 2 +-\n drivers/net/axgbe/axgbe_common.h | 2 +-\n drivers/net/bnx2x/bnx2x_ethdev.c | 2 +-\n drivers/net/bnxt/bnxt_ethdev.c | 2 +-\n drivers/net/bnxt/rte_pmd_bnxt.c | 2 +-\n drivers/net/cxgbe/base/t4_hw.c | 2 +-\n drivers/net/cxgbe/cxgbe_ethdev.c | 2 +-\n drivers/net/cxgbe/cxgbe_main.c | 2 +-\n drivers/net/cxgbe/sge.c | 2 +-\n drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-\n drivers/net/dpaa2/dpaa2_recycle.c | 2 +-\n drivers/net/dpaa2/dpaa2_rxtx.c | 2 +-\n drivers/net/dpaa2/dpaa2_sparser.c | 2 +-\n drivers/net/e1000/em_ethdev.c | 2 +-\n drivers/net/e1000/igb_ethdev.c | 2 +-\n drivers/net/e1000/igb_flow.c | 2 +-\n drivers/net/ena/ena_ethdev.h | 2 +-\n drivers/net/enic/enic_ethdev.c | 2 +-\n drivers/net/enic/enic_vf_representor.c | 2 +-\n drivers/net/failsafe/failsafe_private.h | 2 +-\n drivers/net/fm10k/fm10k_ethdev.c | 2 +-\n drivers/net/i40e/i40e_ethdev.c | 2 +-\n drivers/net/iavf/iavf_ethdev.c | 2 +-\n drivers/net/iavf/iavf_vchnl.c | 2 +-\n drivers/net/ice/ice_dcf.c | 2 +-\n drivers/net/ice/ice_dcf_ethdev.c | 2 +-\n drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-\n drivers/net/ixgbe/ixgbe_flow.c | 2 +-\n drivers/net/mlx4/mlx4.c | 2 +-\n drivers/net/netvsc/hn_ethdev.c | 2 +-\n drivers/net/netvsc/hn_nvs.c | 2 +-\n drivers/net/netvsc/hn_rndis.c | 2 +-\n drivers/net/netvsc/hn_rxtx.c | 2 +-\n drivers/net/nfp/nfp_common.c | 2 +-\n drivers/net/nfp/nfp_ethdev.c | 2 +-\n drivers/net/octeontx/octeontx_ethdev.c | 2 +-\n drivers/net/qede/qede_ethdev.h | 2 +-\n drivers/net/sfc/sfc_ethdev.c | 2 +-\n drivers/net/sfc/sfc_sw_stats.c | 2 +-\n drivers/net/sfc/sfc_sw_stats.h | 2 +-\n drivers/net/thunderx/nicvf_ethdev.c | 2 +-\n drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +-\n drivers/net/virtio/virtio_ethdev.c | 2 +-\n drivers/net/virtio/virtio_pci_ethdev.c | 2 +-\n drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +-\n drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +-\n drivers/raw/skeleton/skeleton_rawdev.c | 2 +-\n drivers/raw/skeleton/skeleton_rawdev_test.c | 2 +-\n drivers/regex/mlx5/mlx5_regex_control.c | 2 +-\n lib/compressdev/rte_compressdev.c | 2 +-\n lib/compressdev/rte_compressdev_pmd.c | 2 +-\n lib/compressdev/rte_compressdev_pmd.h | 1 +\n lib/cryptodev/cryptodev_pmd.c | 2 +-\n lib/cryptodev/cryptodev_pmd.h | 1 +\n lib/cryptodev/rte_cryptodev.c | 2 +-\n lib/dmadev/rte_dmadev_pmd.h | 2 +-\n lib/eal/common/eal_common_dev.c | 2 +-\n lib/eal/include/dev_driver.h | 28 +++++++++++++++++++\n lib/eal/include/meson.build | 1 +\n lib/eal/include/rte_dev.h | 11 ++------\n lib/ethdev/ethdev_driver.h | 1 +\n lib/eventdev/eventdev_pmd.h | 2 +-\n lib/eventdev/rte_event_crypto_adapter.c | 2 +-\n lib/eventdev/rte_event_eth_rx_adapter.c | 2 +-\n lib/eventdev/rte_eventdev.c | 2 +-\n lib/gpudev/gpudev_driver.h | 2 +-\n lib/mempool/rte_mempool_ops.c | 2 +-\n lib/pcapng/rte_pcapng.c | 2 +-\n lib/rawdev/rte_rawdev.c | 2 +-\n lib/rawdev/rte_rawdev_pmd.h | 2 +-\n lib/security/rte_security.c | 2 +-\n 114 files changed, 143 insertions(+), 114 deletions(-)\n create mode 100644 lib/eal/include/dev_driver.h", "diff": "diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c\nindex 801e8920df..e2d9409185 100644\n--- a/drivers/baseband/acc100/rte_acc100_pmd.c\n+++ b/drivers/baseband/acc100/rte_acc100_pmd.c\n@@ -6,7 +6,7 @@\n \n #include <rte_common.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_mempool.h>\n #include <rte_byteorder.h>\ndiff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c\nindex c1d877c87f..51dd090c1b 100644\n--- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c\n+++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c\n@@ -6,7 +6,7 @@\n \n #include <rte_common.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_mempool.h>\n #include <rte_errno.h>\ndiff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c\nindex f16814e241..036579e3ec 100644\n--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c\n+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c\n@@ -6,7 +6,7 @@\n \n #include <rte_common.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_mempool.h>\n #include <rte_errno.h>\ndiff --git a/drivers/bus/auxiliary/auxiliary_params.c b/drivers/bus/auxiliary/auxiliary_params.c\nindex a889e392c6..e4c7ee0c3b 100644\n--- a/drivers/bus/auxiliary/auxiliary_params.c\n+++ b/drivers/bus/auxiliary/auxiliary_params.c\n@@ -5,7 +5,7 @@\n #include <string.h>\n \n #include <bus_driver.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_kvargs.h>\n \ndiff --git a/drivers/bus/auxiliary/bus_auxiliary_driver.h b/drivers/bus/auxiliary/bus_auxiliary_driver.h\nindex 44bacc3c0e..13c18418bd 100644\n--- a/drivers/bus/auxiliary/bus_auxiliary_driver.h\n+++ b/drivers/bus/auxiliary/bus_auxiliary_driver.h\n@@ -22,10 +22,10 @@ extern \"C\" {\n #include <stdint.h>\n #include <inttypes.h>\n \n+#include <dev_driver.h>\n #include <rte_compat.h>\n #include <rte_debug.h>\n #include <rte_interrupts.h>\n-#include <rte_dev.h>\n #include <rte_kvargs.h>\n \n #define RTE_BUS_AUXILIARY_NAME \"auxiliary\"\ndiff --git a/drivers/bus/dpaa/bus_dpaa_driver.h b/drivers/bus/dpaa/bus_dpaa_driver.h\nindex 4360295335..937a742525 100644\n--- a/drivers/bus/dpaa/bus_dpaa_driver.h\n+++ b/drivers/bus/dpaa/bus_dpaa_driver.h\n@@ -6,9 +6,11 @@\n #ifndef BUS_DPAA_DRIVER_H\n #define BUS_DPAA_DRIVER_H\n \n+#include <dev_driver.h>\n #include <rte_compat.h>\n #include <rte_mbuf_dyn.h>\n #include <rte_mempool.h>\n+\n #include <dpaax_iova_table.h>\n \n #include <dpaa_of.h>\ndiff --git a/drivers/bus/fslmc/bus_fslmc_driver.h b/drivers/bus/fslmc/bus_fslmc_driver.h\nindex 798ddebf3a..ac3d98dcc0 100644\n--- a/drivers/bus/fslmc/bus_fslmc_driver.h\n+++ b/drivers/bus/fslmc/bus_fslmc_driver.h\n@@ -26,10 +26,10 @@ extern \"C\" {\n #include <inttypes.h>\n #include <linux/vfio.h>\n \n+#include <dev_driver.h>\n #include <rte_compat.h>\n #include <rte_debug.h>\n #include <rte_interrupts.h>\n-#include <rte_dev.h>\n #include <rte_tailq.h>\n #include <rte_devargs.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 8604e43947..5966776a85 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -28,7 +28,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal_memconfig.h>\n \n #include \"private.h\"\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\nindex cfe4280f87..d7f6e45b7d 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n@@ -18,7 +18,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <rte_mbuf_pool_ops.h>\n \ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\nindex b7d81b518c..07256ed7ec 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n@@ -17,7 +17,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n \n #include <fslmc_logs.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 071b0d297d..4aec7b2cd8 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -30,7 +30,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <fslmc_logs.h>\n #include <bus_fslmc_driver.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\nindex 223e34bcba..65e2d799c3 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c\n@@ -10,7 +10,7 @@\n #include <errno.h>\n \n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"private.h\"\n #include <fslmc_logs.h>\ndiff --git a/drivers/bus/ifpga/bus_ifpga_driver.h b/drivers/bus/ifpga/bus_ifpga_driver.h\nindex 7b75c2ddbc..10bf2f92ce 100644\n--- a/drivers/bus/ifpga/bus_ifpga_driver.h\n+++ b/drivers/bus/ifpga/bus_ifpga_driver.h\n@@ -15,6 +15,7 @@\n extern \"C\" {\n #endif /* __cplusplus */\n \n+#include <dev_driver.h>\n #include <rte_compat.h>\n #include <rte_pci.h>\n #include <rte_interrupts.h>\ndiff --git a/drivers/bus/pci/bus_pci_driver.h b/drivers/bus/pci/bus_pci_driver.h\nindex b5c7dee617..9c56307405 100644\n--- a/drivers/bus/pci/bus_pci_driver.h\n+++ b/drivers/bus/pci/bus_pci_driver.h\n@@ -10,8 +10,8 @@\n extern \"C\" {\n #endif\n \n+#include <dev_driver.h>\n #include <rte_bus_pci.h>\n-#include <rte_dev.h>\n #include <rte_compat.h>\n \n /** Pathname of PCI devices directory. */\ndiff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c\nindex 39d702a418..d24cc201b8 100644\n--- a/drivers/bus/pci/pci_params.c\n+++ b/drivers/bus/pci/pci_params.c\n@@ -6,7 +6,7 @@\n \n #include <bus_driver.h>\n #include <rte_bus_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_kvargs.h>\n #include <rte_devargs.h>\ndiff --git a/drivers/bus/vdev/bus_vdev_driver.h b/drivers/bus/vdev/bus_vdev_driver.h\nindex 36748cdfae..d05a7f7115 100644\n--- a/drivers/bus/vdev/bus_vdev_driver.h\n+++ b/drivers/bus/vdev/bus_vdev_driver.h\n@@ -9,9 +9,9 @@\n extern \"C\" {\n #endif\n \n+#include <dev_driver.h>\n #include <rte_bus_vdev.h>\n #include <rte_compat.h>\n-#include <rte_dev.h>\n #include <rte_devargs.h>\n \n struct rte_vdev_device {\ndiff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c\nindex 1b8410fe5b..7c8170e5a6 100644\n--- a/drivers/bus/vdev/vdev.c\n+++ b/drivers/bus/vdev/vdev.c\n@@ -13,7 +13,7 @@\n #include <bus_driver.h>\n #include <bus_vdev_driver.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_common.h>\n #include <rte_devargs.h>\n #include <rte_memory.h>\ndiff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c\nindex 2c72614776..2d10a1e8ad 100644\n--- a/drivers/bus/vdev/vdev_params.c\n+++ b/drivers/bus/vdev/vdev_params.c\n@@ -4,7 +4,7 @@\n \n #include <string.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_kvargs.h>\n #include <rte_errno.h>\n \ndiff --git a/drivers/bus/vmbus/bus_vmbus_driver.h b/drivers/bus/vmbus/bus_vmbus_driver.h\nindex 3424e791c9..e60290c835 100644\n--- a/drivers/bus/vmbus/bus_vmbus_driver.h\n+++ b/drivers/bus/vmbus/bus_vmbus_driver.h\n@@ -10,9 +10,9 @@\n extern \"C\" {\n #endif\n \n+#include <dev_driver.h>\n #include <rte_bus_vmbus.h>\n #include <rte_compat.h>\n-#include <rte_dev.h>\n \n struct vmbus_channel;\n struct vmbus_mon_page;\ndiff --git a/drivers/common/qat/dev/qat_dev_gen4.c b/drivers/common/qat/dev/qat_dev_gen4.c\nindex 7ffde5f4c8..85d6ddfcf4 100644\n--- a/drivers/common/qat/dev/qat_dev_gen4.c\n+++ b/drivers/common/qat/dev/qat_dev_gen4.c\n@@ -2,7 +2,7 @@\n * Copyright(c) 2021 Intel Corporation\n */\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_pci.h>\n \n #include \"qat_device.h\"\ndiff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c\nindex 4a1be35b47..e58e4ceec0 100644\n--- a/drivers/common/qat/qat_qp.c\n+++ b/drivers/common/qat/qat_qp.c\n@@ -4,7 +4,7 @@\n \n #include <rte_common.h>\n #include <rte_cycles.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_pci.h>\ndiff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c\nindex 7d657d81bc..445a3baa67 100644\n--- a/drivers/compress/zlib/zlib_pmd_ops.c\n+++ b/drivers/compress/zlib/zlib_pmd_ops.c\n@@ -4,7 +4,7 @@\n \n #include <string.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/crypto/bcmfs/bcmfs_qp.c b/drivers/crypto/bcmfs/bcmfs_qp.c\nindex 61d457f4e0..d1ede5e990 100644\n--- a/drivers/crypto/bcmfs/bcmfs_qp.c\n+++ b/drivers/crypto/bcmfs/bcmfs_qp.c\n@@ -8,7 +8,7 @@\n #include <rte_atomic.h>\n #include <rte_bitmap.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_prefetch.h>\ndiff --git a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c\nindex bc7fb67218..78272d616c 100644\n--- a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c\n+++ b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c\n@@ -4,7 +4,7 @@\n */\n \n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_malloc.h>\n #include <cryptodev_pmd.h>\ndiff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c\nindex 6c3e45e333..013f3be1e6 100644\n--- a/drivers/crypto/ccp/rte_ccp_pmd.c\n+++ b/drivers/crypto/ccp/rte_ccp_pmd.c\n@@ -9,7 +9,7 @@\n #include <rte_cryptodev.h>\n #include <cryptodev_pmd.h>\n #include <rte_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n \n #include \"ccp_crypto.h\"\ndiff --git a/drivers/crypto/cnxk/cn10k_cryptodev.c b/drivers/crypto/cnxk/cn10k_cryptodev.c\nindex 3fd9f3c426..db11ac7444 100644\n--- a/drivers/crypto/cnxk/cn10k_cryptodev.c\n+++ b/drivers/crypto/cnxk/cn10k_cryptodev.c\n@@ -7,7 +7,7 @@\n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n #include <cryptodev_pmd.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_pci.h>\n \n #include \"cn10k_cryptodev.h\"\ndiff --git a/drivers/crypto/cnxk/cn9k_cryptodev.c b/drivers/crypto/cnxk/cn9k_cryptodev.c\nindex bd425f95ff..4cfc1f2150 100644\n--- a/drivers/crypto/cnxk/cn9k_cryptodev.c\n+++ b/drivers/crypto/cnxk/cn9k_cryptodev.c\n@@ -7,7 +7,7 @@\n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n #include <cryptodev_pmd.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_pci.h>\n \n #include \"cn9k_cryptodev.h\"\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex 0cce861899..3b13578de0 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -17,7 +17,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <cryptodev_pmd.h>\n #include <rte_common.h>\n #include <bus_fslmc_driver.h>\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 7e554cb2b1..c6bd785262 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -19,7 +19,7 @@\n #include <rte_security_driver.h>\n #endif\n #include <rte_cycles.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_io.h>\n #include <rte_ip.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c\nindex f3a1bd626c..971f82897c 100644\n--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c\n+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c\n@@ -5,7 +5,7 @@\n \n #include <rte_common.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_cryptodev.h>\n #include <cryptodev_pmd.h>\n #include <rte_reorder.h>\ndiff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c\nindex e30dcfc281..9b7b16c6e3 100644\n--- a/drivers/dma/idxd/idxd_bus.c\n+++ b/drivers/dma/idxd/idxd_bus.c\n@@ -9,6 +9,7 @@\n #include <libgen.h>\n \n #include <bus_driver.h>\n+#include <dev_driver.h>\n #include <rte_devargs.h>\n #include <rte_eal.h>\n #include <rte_log.h>\ndiff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c\nindex 26af75beb8..d7ac58bfde 100644\n--- a/drivers/event/dlb2/dlb2.c\n+++ b/drivers/event/dlb2/dlb2.c\n@@ -17,7 +17,7 @@\n #include <rte_config.h>\n #include <rte_cycles.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_eventdev.h>\n #include <eventdev_pmd.h>\ndiff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c\nindex 9f8c6cd8b8..71ac141b66 100644\n--- a/drivers/event/dlb2/pf/dlb2_pf.c\n+++ b/drivers/event/dlb2/pf/dlb2_pf.c\n@@ -15,7 +15,7 @@\n \n #include <rte_debug.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_devargs.h>\n #include <rte_mbuf.h>\n #include <rte_ring.h>\ndiff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c\nindex aa403f9e06..8e470584ea 100644\n--- a/drivers/event/dpaa/dpaa_eventdev.c\n+++ b/drivers/event/dpaa/dpaa_eventdev.c\n@@ -14,7 +14,7 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_lcore.h>\n #include <rte_log.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c\nindex 08df6e223a..1001297cda 100644\n--- a/drivers/event/dpaa2/dpaa2_eventdev.c\n+++ b/drivers/event/dpaa2/dpaa2_eventdev.c\n@@ -14,7 +14,7 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <bus_fslmc_driver.h>\n #include <rte_lcore.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\nindex 3882a9cf1d..a68d3ac154 100644\n--- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n+++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n@@ -17,7 +17,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n \n #include <bus_fslmc_driver.h>\ndiff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c\nindex fe157c59d5..99fa326ad5 100644\n--- a/drivers/event/octeontx/ssovf_evdev.c\n+++ b/drivers/event/octeontx/ssovf_evdev.c\n@@ -7,7 +7,7 @@\n #include <rte_common.h>\n #include <cryptodev_pmd.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <ethdev_driver.h>\n #include <rte_event_eth_rx_adapter.h>\ndiff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c\nindex 6bd8fec6d4..8513b9a013 100644\n--- a/drivers/event/skeleton/skeleton_eventdev.c\n+++ b/drivers/event/skeleton/skeleton_eventdev.c\n@@ -12,7 +12,7 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/gpu/cuda/cuda.c b/drivers/gpu/cuda/cuda.c\nindex 2be7b8d2df..a552aabeb8 100644\n--- a/drivers/gpu/cuda/cuda.c\n+++ b/drivers/gpu/cuda/cuda.c\n@@ -8,7 +8,7 @@\n #include <rte_pci.h>\n #include <bus_pci_driver.h>\n #include <rte_byteorder.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <gpudev_driver.h>\n \ndiff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\nindex 56c629c681..84371d5d1a 100644\n--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n@@ -20,7 +20,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include \"rte_dpaa2_mempool.h\"\n \n #include \"fslmc_vfio.h\"\ndiff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c\nindex fd7be47311..9957de2314 100644\n--- a/drivers/net/af_xdp/rte_eth_af_xdp.c\n+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c\n@@ -24,7 +24,7 @@\n #include <rte_string_fns.h>\n #include <rte_branch_prediction.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n #include <rte_lcore.h>\ndiff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h\nindex 748db590c1..71d0b53e03 100644\n--- a/drivers/net/ark/ark_global.h\n+++ b/drivers/net/ark/ark_global.h\n@@ -15,7 +15,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_version.h>\n \n #include \"ark_pktdir.h\"\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex 7c0cb666fb..b2a08f5635 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -22,7 +22,7 @@\n #include <rte_cycles.h>\n #include <rte_spinlock.h>\n #include <rte_byteorder.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_io.h>\ndiff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h\nindex b9ebf64fb8..a5d11c5832 100644\n--- a/drivers/net/axgbe/axgbe_common.h\n+++ b/drivers/net/axgbe/axgbe_common.h\n@@ -33,7 +33,7 @@\n #include <rte_memzone.h>\n #include <rte_ether.h>\n #include <rte_ethdev.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <ethdev_pci.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c\nindex f36ad30e17..4448cf2de2 100644\n--- a/drivers/net/bnx2x/bnx2x_ethdev.c\n+++ b/drivers/net/bnx2x/bnx2x_ethdev.c\n@@ -9,7 +9,7 @@\n #include \"bnx2x_rxtx.h\"\n \n #include <rte_string_fns.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_pci.h>\n #include <rte_alarm.h>\n \ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex e275d3a53f..1460dce2ab 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -6,7 +6,7 @@\n #include <inttypes.h>\n #include <stdbool.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c\nindex 77ecbef04c..fd1506ddd4 100644\n--- a/drivers/net/bnxt/rte_pmd_bnxt.c\n+++ b/drivers/net/bnxt/rte_pmd_bnxt.c\n@@ -7,7 +7,7 @@\n #include <stdbool.h>\n #include <unistd.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_cycles.h>\ndiff --git a/drivers/net/cxgbe/base/t4_hw.c b/drivers/net/cxgbe/base/t4_hw.c\nindex 384080e6d3..bed755f5d9 100644\n--- a/drivers/net/cxgbe/base/t4_hw.c\n+++ b/drivers/net/cxgbe/base/t4_hw.c\n@@ -18,7 +18,7 @@\n #include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_byteorder.h>\n \n #include \"common.h\"\ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex fd71a50a58..45bbeaef0c 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -31,7 +31,7 @@\n #include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"cxgbe.h\"\n #include \"cxgbe_pfvf.h\"\ndiff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c\nindex 3c02c98b3d..f8dd833032 100644\n--- a/drivers/net/cxgbe/cxgbe_main.c\n+++ b/drivers/net/cxgbe/cxgbe_main.c\n@@ -31,7 +31,7 @@\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_kvargs.h>\n \n #include \"base/common.h\"\ndiff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c\nindex 5d91355c9a..5b13cb5c94 100644\n--- a/drivers/net/cxgbe/sge.c\n+++ b/drivers/net/cxgbe/sge.c\n@@ -30,7 +30,7 @@\n #include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"base/common.h\"\n #include \"base/t4_regs.h\"\ndiff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\nindex 9509f6e8a3..4d33b51fea 100644\n--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\n+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\n@@ -15,7 +15,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <dpaa2_pmd_logs.h>\n #include <dpaa2_hw_pvt.h>\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex f876f4790c..37a8b43114 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -15,7 +15,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <bus_fslmc_driver.h>\n #include <rte_flow_driver.h>\n #include \"rte_dpaa2_mempool.h\"\ndiff --git a/drivers/net/dpaa2/dpaa2_recycle.c b/drivers/net/dpaa2/dpaa2_recycle.c\nindex 932570c6e0..fbfdf360d1 100644\n--- a/drivers/net/dpaa2/dpaa2_recycle.c\n+++ b/drivers/net/dpaa2/dpaa2_recycle.c\n@@ -14,7 +14,7 @@\n #include <rte_string_fns.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <bus_fslmc_driver.h>\n #include <rte_flow_driver.h>\n \ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex 7b9c528d13..9436a95ac8 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -13,7 +13,7 @@\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_hexdump.h>\n \n #include <bus_fslmc_driver.h>\ndiff --git a/drivers/net/dpaa2/dpaa2_sparser.c b/drivers/net/dpaa2/dpaa2_sparser.c\nindex ba0d500f74..63463c4fbf 100644\n--- a/drivers/net/dpaa2/dpaa2_sparser.c\n+++ b/drivers/net/dpaa2/dpaa2_sparser.c\n@@ -7,7 +7,7 @@\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <fslmc_logs.h>\n #include <fslmc_vfio.h>\ndiff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c\nindex 409de50083..8ee9be12ad 100644\n--- a/drivers/net/e1000/em_ethdev.c\n+++ b/drivers/net/e1000/em_ethdev.c\n@@ -20,7 +20,7 @@\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"e1000_logs.h\"\n #include \"base/e1000_api.h\"\ndiff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c\nindex 43979992d3..d6bcc5bf58 100644\n--- a/drivers/net/e1000/igb_ethdev.c\n+++ b/drivers/net/e1000/igb_ethdev.c\n@@ -22,7 +22,7 @@\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"e1000_logs.h\"\n #include \"base/e1000_api.h\"\ndiff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c\nindex e46697b6a1..b775310651 100644\n--- a/drivers/net/e1000/igb_flow.c\n+++ b/drivers/net/e1000/igb_flow.c\n@@ -21,7 +21,7 @@\n #include <rte_eal.h>\n #include <rte_atomic.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n \ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 4709675af8..4d27fba585 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -14,7 +14,7 @@\n #include <rte_pci.h>\n #include <bus_pci_driver.h>\n #include <rte_timer.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_net.h>\n \n #include \"ena_com.h\"\ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex 998436e5e8..cdf0915591 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -6,7 +6,7 @@\n #include <stdio.h>\n #include <stdint.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_pci.h>\n #include <bus_pci_driver.h>\n #include <ethdev_driver.h>\ndiff --git a/drivers/net/enic/enic_vf_representor.c b/drivers/net/enic/enic_vf_representor.c\nindex 7312c411bd..46f85964e9 100644\n--- a/drivers/net/enic/enic_vf_representor.c\n+++ b/drivers/net/enic/enic_vf_representor.c\n@@ -7,7 +7,7 @@\n \n #include <bus_pci_driver.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n #include <rte_flow_driver.h>\ndiff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h\nindex a80f5e2caf..53a451c1b1 100644\n--- a/drivers/net/failsafe/failsafe_private.h\n+++ b/drivers/net/failsafe/failsafe_private.h\n@@ -11,7 +11,7 @@\n #include <pthread.h>\n \n #include <rte_atomic.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <rte_devargs.h>\n #include <rte_flow.h>\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 8bbd8b445d..7adb20bff9 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -7,7 +7,7 @@\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_string_fns.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_spinlock.h>\n #include <rte_kvargs.h>\n #include <rte_vect.h>\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 87c22b6b54..1775be63c6 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -23,7 +23,7 @@\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_alarm.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_tailq.h>\n #include <rte_hash_crc.h>\n #include <rte_bitmap.h>\ndiff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c\nindex 506fcff6e3..ef2ab06475 100644\n--- a/drivers/net/iavf/iavf_ethdev.c\n+++ b/drivers/net/iavf/iavf_ethdev.c\n@@ -24,7 +24,7 @@\n #include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"iavf.h\"\n #include \"iavf_rxtx.h\"\ndiff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c\nindex 21bd1e2193..15f695682d 100644\n--- a/drivers/net/iavf/iavf_vchnl.c\n+++ b/drivers/net/iavf/iavf_vchnl.c\n@@ -19,7 +19,7 @@\n #include <rte_ether.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"iavf.h\"\n #include \"iavf_rxtx.h\"\ndiff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c\nindex 885d58c0f4..1c3d22ae0f 100644\n--- a/drivers/net/ice/ice_dcf.c\n+++ b/drivers/net/ice/ice_dcf.c\n@@ -21,7 +21,7 @@\n #include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"ice_dcf.h\"\n #include \"ice_rxtx.h\"\ndiff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c\nindex 0da267db1f..dee712af98 100644\n--- a/drivers/net/ice/ice_dcf_ethdev.c\n+++ b/drivers/net/ice/ice_dcf_ethdev.c\n@@ -18,7 +18,7 @@\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <iavf_devids.h>\n \ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 552e41692c..04c9ce78a2 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -30,7 +30,7 @@\n #include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_hash_crc.h>\n #ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c\nindex 368342872a..67373a7b78 100644\n--- a/drivers/net/ixgbe/ixgbe_flow.c\n+++ b/drivers/net/ixgbe/ixgbe_flow.c\n@@ -27,7 +27,7 @@\n #include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_hash_crc.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex 910b76a92c..7e7e1824ef 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -31,7 +31,7 @@\n #endif\n \n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\ndiff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c\nindex ccc06bdda6..d0bbc0a4c0 100644\n--- a/drivers/net/netvsc/hn_ethdev.c\n+++ b/drivers/net/netvsc/hn_ethdev.c\n@@ -30,7 +30,7 @@\n #include <rte_errno.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <bus_driver.h>\n #include <bus_vmbus_driver.h>\n #include <rte_alarm.h>\ndiff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c\nindex 817fb06dfb..7db82af9f3 100644\n--- a/drivers/net/netvsc/hn_nvs.c\n+++ b/drivers/net/netvsc/hn_nvs.c\n@@ -28,7 +28,7 @@\n #include <rte_cycles.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <bus_vmbus_driver.h>\n \n #include \"hn_logs.h\"\ndiff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c\nindex 20f75a17b0..e6f1f28768 100644\n--- a/drivers/net/netvsc/hn_rndis.c\n+++ b/drivers/net/netvsc/hn_rndis.c\n@@ -26,7 +26,7 @@\n #include <rte_cycles.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <bus_vmbus_driver.h>\n \n #include \"hn_logs.h\"\ndiff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c\nindex 61cf374224..bc6f60c64a 100644\n--- a/drivers/net/netvsc/hn_rxtx.c\n+++ b/drivers/net/netvsc/hn_rxtx.c\n@@ -25,7 +25,7 @@\n #include <rte_errno.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_net.h>\n #include <bus_vmbus_driver.h>\n #include <rte_spinlock.h>\ndiff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex 0e55f0c792..eaafe11fb9 100644\n--- a/drivers/net/nfp/nfp_common.c\n+++ b/drivers/net/nfp/nfp_common.c\n@@ -19,7 +19,7 @@\n #include <rte_debug.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_ether.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 5cdd34e588..47359501bc 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -16,7 +16,7 @@\n #include <rte_common.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_ether.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\ndiff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c\nindex 9ada22e2ff..0eee191566 100644\n--- a/drivers/net/octeontx/octeontx_ethdev.c\n+++ b/drivers/net/octeontx/octeontx_ethdev.c\n@@ -15,7 +15,7 @@\n #include <bus_vdev_driver.h>\n #include <rte_cycles.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_devargs.h>\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h\nindex a38b701183..b781bcdcfd 100644\n--- a/drivers/net/qede/qede_ethdev.h\n+++ b/drivers/net/qede/qede_ethdev.h\n@@ -13,7 +13,7 @@\n #include <rte_ether.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_ip.h>\n \n /* ecore includes */\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 506c62a726..2ec743ebce 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -7,7 +7,7 @@\n * for Solarflare) and Solarflare Communications, Inc.\n */\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n #include <rte_pci.h>\ndiff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c\nindex 81f5aa3cc4..3ae5023b6f 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -2,7 +2,7 @@\n *\n * Copyright(c) 2021 Xilinx, Inc.\n */\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_bitmap.h>\n \n #include \"sfc.h\"\ndiff --git a/drivers/net/sfc/sfc_sw_stats.h b/drivers/net/sfc/sfc_sw_stats.h\nindex 1abded8018..d9738e5214 100644\n--- a/drivers/net/sfc/sfc_sw_stats.h\n+++ b/drivers/net/sfc/sfc_sw_stats.h\n@@ -5,7 +5,7 @@\n #ifndef _SFC_SW_STATS_H\n #define _SFC_SW_STATS_H\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"sfc.h\"\n \ndiff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c\nindex 28183ec740..9f57cb1a20 100644\n--- a/drivers/net/thunderx/nicvf_ethdev.c\n+++ b/drivers/net/thunderx/nicvf_ethdev.c\n@@ -20,7 +20,7 @@\n #include <rte_common.h>\n #include <rte_cycles.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n #include <ethdev_driver.h>\ndiff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c\nindex 5c7430718b..32b7296877 100644\n--- a/drivers/net/vdev_netvsc/vdev_netvsc.c\n+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c\n@@ -27,7 +27,7 @@\n #include <rte_alarm.h>\n #include <bus_vdev_driver.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_ethdev.h>\n #include <rte_ether.h>\ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex d180162abd..edf3becd32 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -24,7 +24,7 @@\n #include <rte_memory.h>\n #include <rte_eal_paging.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n \ndiff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c\nindex 2b9e35cef5..abc63b0935 100644\n--- a/drivers/net/virtio/virtio_pci_ethdev.c\n+++ b/drivers/net/virtio/virtio_pci_ethdev.c\n@@ -16,7 +16,7 @@\n \n #include <rte_memory.h>\n #include <rte_eal.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_kvargs.h>\n \n #include \"virtio.h\"\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c\nindex 101b1cb500..fd946dec5c 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c\n@@ -30,7 +30,7 @@\n #include <ethdev_pci.h>\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"base/vmxnet3_defs.h\"\n \ndiff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c\nindex db029cbf34..909fb8faab 100644\n--- a/drivers/raw/cnxk_bphy/cnxk_bphy.c\n+++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c\n@@ -3,7 +3,7 @@\n */\n #include <bus_pci_driver.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_lcore.h>\n #include <rte_pci.h>\ndiff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c\nindex 19b523a815..a06b724866 100644\n--- a/drivers/raw/skeleton/skeleton_rawdev.c\n+++ b/drivers/raw/skeleton/skeleton_rawdev.c\n@@ -13,7 +13,7 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_kvargs.h>\n #include <rte_log.h>\ndiff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c\nindex fc257c5f44..8ef7a6b127 100644\n--- a/drivers/raw/skeleton/skeleton_rawdev_test.c\n+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c\n@@ -6,7 +6,7 @@\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_rawdev.h>\n #include <bus_vdev_driver.h>\n #include <rte_test.h>\ndiff --git a/drivers/regex/mlx5/mlx5_regex_control.c b/drivers/regex/mlx5/mlx5_regex_control.c\nindex 6ab62a12fc..92cf5f495e 100644\n--- a/drivers/regex/mlx5/mlx5_regex_control.c\n+++ b/drivers/regex/mlx5/mlx5_regex_control.c\n@@ -11,7 +11,7 @@\n #include <rte_regexdev.h>\n #include <rte_regexdev_core.h>\n #include <rte_regexdev_driver.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include <mlx5_common.h>\n #include <mlx5_glue.h>\ndiff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c\nindex 7f6dedbc52..639a0d66ca 100644\n--- a/lib/compressdev/rte_compressdev.c\n+++ b/lib/compressdev/rte_compressdev.c\n@@ -9,7 +9,7 @@\n #include <rte_common.h>\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n #include <rte_memzone.h>\n \ndiff --git a/lib/compressdev/rte_compressdev_pmd.c b/lib/compressdev/rte_compressdev_pmd.c\nindex 9bfae077db..41f1415bea 100644\n--- a/lib/compressdev/rte_compressdev_pmd.c\n+++ b/lib/compressdev/rte_compressdev_pmd.c\n@@ -5,7 +5,7 @@\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_eal.h>\n \n #include \"rte_compressdev_internal.h\"\ndiff --git a/lib/compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h\nindex 9fabc399c5..72e52f876f 100644\n--- a/lib/compressdev/rte_compressdev_pmd.h\n+++ b/lib/compressdev/rte_compressdev_pmd.h\n@@ -19,6 +19,7 @@ extern \"C\" {\n \n #include <string.h>\n \n+#include <dev_driver.h>\n \n #include \"rte_compressdev.h\"\n #include \"rte_compressdev_internal.h\"\ndiff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c\nindex 75d0075b86..f07b92dfd7 100644\n--- a/lib/cryptodev/cryptodev_pmd.c\n+++ b/lib/cryptodev/cryptodev_pmd.c\n@@ -4,7 +4,7 @@\n \n #include <sys/queue.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\ndiff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h\nindex 3dcc3cb7ed..96d7e225b0 100644\n--- a/lib/cryptodev/cryptodev_pmd.h\n+++ b/lib/cryptodev/cryptodev_pmd.h\n@@ -19,6 +19,7 @@ extern \"C\" {\n \n #include <string.h>\n \n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_log.h>\n #include <rte_common.h>\ndiff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c\nindex 42f3221052..1dad092317 100644\n--- a/lib/cryptodev/rte_cryptodev.c\n+++ b/lib/cryptodev/rte_cryptodev.c\n@@ -13,7 +13,7 @@\n \n #include <rte_log.h>\n #include <rte_debug.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_memory.h>\n #include <rte_memcpy.h>\n #include <rte_memzone.h>\ndiff --git a/lib/dmadev/rte_dmadev_pmd.h b/lib/dmadev/rte_dmadev_pmd.h\nindex 82ab7a8cc7..acd7f71cd1 100644\n--- a/lib/dmadev/rte_dmadev_pmd.h\n+++ b/lib/dmadev/rte_dmadev_pmd.h\n@@ -14,7 +14,7 @@\n * by any application.\n */\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"rte_dmadev.h\"\n \ndiff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c\nindex 16c5aef1d8..5b64b80cb9 100644\n--- a/lib/eal/common/eal_common_dev.c\n+++ b/lib/eal/common/eal_common_dev.c\n@@ -8,8 +8,8 @@\n #include <sys/queue.h>\n \n #include <bus_driver.h>\n+#include <dev_driver.h>\n #include <rte_class.h>\n-#include <rte_dev.h>\n #include <rte_devargs.h>\n #include <rte_errno.h>\n #include <rte_log.h>\ndiff --git a/lib/eal/include/dev_driver.h b/lib/eal/include/dev_driver.h\nnew file mode 100644\nindex 0000000000..015188abd5\n--- /dev/null\n+++ b/lib/eal/include/dev_driver.h\n@@ -0,0 +1,28 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2022 Red Hat, Inc.\n+ */\n+\n+#ifndef DEV_DRIVER_H\n+#define DEV_DRIVER_H\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+#include <rte_common.h>\n+#include <rte_dev.h>\n+\n+/**\n+ * A structure describing a device driver.\n+ */\n+struct rte_driver {\n+\tRTE_TAILQ_ENTRY(rte_driver) next; /**< Next in list. */\n+\tconst char *name; /**< Driver name. */\n+\tconst char *alias; /**< Driver alias. */\n+};\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* DEV_DRIVER_H */\ndiff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build\nindex 77d8621a51..cfcd40aaed 100644\n--- a/lib/eal/include/meson.build\n+++ b/lib/eal/include/meson.build\n@@ -57,6 +57,7 @@ headers += files(\n \n driver_sdk_headers = files(\n 'bus_driver.h',\n+ 'dev_driver.h',\n )\n \n # special case install the generic headers, since they go in a subdir\ndiff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h\nindex 871a046ffe..875ecee371 100644\n--- a/lib/eal/include/rte_dev.h\n+++ b/lib/eal/include/rte_dev.h\n@@ -23,6 +23,8 @@ extern \"C\" {\n #include <rte_compat.h>\n #include <rte_log.h>\n \n+struct rte_driver;\n+\n /**\n * The device event type.\n */\n@@ -53,15 +55,6 @@ struct rte_mem_resource {\n \tvoid *addr; /**< Virtual address, NULL when not mapped. */\n };\n \n-/**\n- * A structure describing a device driver.\n- */\n-struct rte_driver {\n-\tRTE_TAILQ_ENTRY(rte_driver) next; /**< Next in list. */\n-\tconst char *name; /**< Driver name. */\n-\tconst char *alias; /**< Driver alias. */\n-};\n-\n /**\n * @warning\n * @b EXPERIMENTAL: this API may change without prior notice\ndiff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h\nindex 5101868ea7..47a55a419e 100644\n--- a/lib/ethdev/ethdev_driver.h\n+++ b/lib/ethdev/ethdev_driver.h\n@@ -19,6 +19,7 @@ extern \"C\" {\n *\n */\n \n+#include <dev_driver.h>\n #include <rte_ethdev.h>\n \n /**\ndiff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h\nindex 69402668d8..def6cd0876 100644\n--- a/lib/eventdev/eventdev_pmd.h\n+++ b/lib/eventdev/eventdev_pmd.h\n@@ -22,7 +22,7 @@ extern \"C\" {\n #include <rte_common.h>\n #include <rte_compat.h>\n #include <rte_config.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\ndiff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c\nindex 7c695176f4..5bc10312fc 100644\n--- a/lib/eventdev/rte_event_crypto_adapter.c\n+++ b/lib/eventdev/rte_event_crypto_adapter.c\n@@ -6,7 +6,7 @@\n #include <string.h>\n #include <stdbool.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_cryptodev.h>\n #include <cryptodev_pmd.h>\ndiff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c\nindex bf8741d2ea..4f4efdae9f 100644\n--- a/lib/eventdev/rte_event_eth_rx_adapter.c\n+++ b/lib/eventdev/rte_event_eth_rx_adapter.c\n@@ -9,7 +9,7 @@\n \n #include <rte_cycles.h>\n #include <rte_common.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <ethdev_driver.h>\n #include <rte_log.h>\ndiff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c\nindex 1dc4f966be..54abee2b3f 100644\n--- a/lib/eventdev/rte_eventdev.c\n+++ b/lib/eventdev/rte_eventdev.c\n@@ -12,7 +12,7 @@\n \n #include <rte_string_fns.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_memzone.h>\n #include <rte_eal.h>\n #include <rte_common.h>\ndiff --git a/lib/gpudev/gpudev_driver.h b/lib/gpudev/gpudev_driver.h\nindex 0e55b00bfe..23972b3dbd 100644\n--- a/lib/gpudev/gpudev_driver.h\n+++ b/lib/gpudev/gpudev_driver.h\n@@ -14,7 +14,7 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"rte_gpudev.h\"\n \ndiff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c\nindex d60235a7e3..058ad147a5 100644\n--- a/lib/mempool/rte_mempool_ops.c\n+++ b/lib/mempool/rte_mempool_ops.c\n@@ -10,7 +10,7 @@\n #include <rte_string_fns.h>\n #include <rte_mempool.h>\n #include <rte_errno.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n \n #include \"rte_mempool_trace.h\"\n \ndiff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c\nindex 72aabd4dd0..af2b814251 100644\n--- a/lib/pcapng/rte_pcapng.c\n+++ b/lib/pcapng/rte_pcapng.c\n@@ -14,7 +14,7 @@\n #include <bus_driver.h>\n #include <rte_common.h>\n #include <rte_cycles.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_errno.h>\n #include <rte_ethdev.h>\n #include <rte_ether.h>\ndiff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c\nindex 2f0a4f132e..bc51258143 100644\n--- a/lib/rawdev/rte_rawdev.c\n+++ b/lib/rawdev/rte_rawdev.c\n@@ -12,7 +12,7 @@\n \n #include <rte_string_fns.h>\n #include <rte_log.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n #include <rte_telemetry.h>\ndiff --git a/lib/rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h\nindex 3b7be57d3e..a51944c8ff 100644\n--- a/lib/rawdev/rte_rawdev_pmd.h\n+++ b/lib/rawdev/rte_rawdev_pmd.h\n@@ -19,7 +19,7 @@ extern \"C\" {\n \n #include <string.h>\n \n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_malloc.h>\n #include <rte_log.h>\n #include <rte_common.h>\ndiff --git a/lib/security/rte_security.c b/lib/security/rte_security.c\nindex 046b6496d2..d036ed33f6 100644\n--- a/lib/security/rte_security.c\n+++ b/lib/security/rte_security.c\n@@ -6,7 +6,7 @@\n \n #include <rte_common.h>\n #include <rte_cryptodev.h>\n-#include <rte_dev.h>\n+#include <dev_driver.h>\n #include <rte_telemetry.h>\n #include \"rte_security.h\"\n #include \"rte_security_driver.h\"\n", "prefixes": [ "RFC", "v2", "v2", "27/29" ] }