The vdev bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
app/test/test_vdev.c | 2 +-
drivers/baseband/la12xx/bbdev_la12xx.c | 2 +-
drivers/baseband/null/bbdev_null.c | 2 +-
.../baseband/turbo_sw/bbdev_turbo_software.c | 2 +-
drivers/bus/vdev/bus_vdev_driver.h | 151 ++++++++++++++++++
drivers/bus/vdev/meson.build | 1 +
drivers/bus/vdev/rte_bus_vdev.h | 131 ---------------
drivers/bus/vdev/vdev.c | 2 +-
drivers/bus/vdev/version.map | 9 +-
drivers/compress/isal/isal_compress_pmd.c | 2 +-
drivers/compress/zlib/zlib_pmd.c | 2 +-
drivers/crypto/armv8/rte_armv8_pmd.c | 2 +-
drivers/crypto/bcmfs/bcmfs_device.h | 2 +-
drivers/crypto/caam_jr/caam_jr.c | 2 +-
drivers/crypto/ccp/rte_ccp_pmd.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.h | 2 +-
drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +-
drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +-
drivers/crypto/null/null_crypto_pmd.c | 2 +-
drivers/crypto/openssl/rte_openssl_pmd.c | 2 +-
drivers/crypto/scheduler/scheduler_pmd.c | 2 +-
drivers/dma/skeleton/skeleton_dmadev.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-
drivers/event/octeontx/ssovf_evdev.c | 2 +-
drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +-
drivers/event/opdl/opdl_evdev.c | 2 +-
drivers/event/opdl/opdl_evdev_init.c | 2 +-
drivers/event/opdl/opdl_test.c | 2 +-
drivers/event/skeleton/skeleton_eventdev.c | 2 +-
drivers/event/sw/sw_evdev.c | 2 +-
drivers/event/sw/sw_evdev_selftest.c | 2 +-
drivers/net/af_packet/rte_eth_af_packet.c | 2 +-
drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
drivers/net/bonding/rte_eth_bond_api.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
drivers/net/failsafe/failsafe.c | 2 +-
drivers/net/ipn3ke/ipn3ke_ethdev.h | 2 +-
drivers/net/kni/rte_eth_kni.c | 2 +-
drivers/net/memif/memif_socket.c | 2 +-
drivers/net/memif/rte_eth_memif.c | 2 +-
drivers/net/mvneta/mvneta_ethdev.c | 2 +-
drivers/net/mvpp2/mrvl_ethdev.c | 2 +-
drivers/net/null/rte_eth_null.c | 2 +-
drivers/net/octeontx/octeontx_ethdev.c | 2 +-
drivers/net/pcap/pcap_ethdev.c | 2 +-
drivers/net/pfe/pfe_ethdev.c | 2 +-
drivers/net/ring/rte_eth_ring.c | 2 +-
drivers/net/softnic/rte_eth_softnic.c | 2 +-
drivers/net/tap/rte_eth_tap.c | 2 +-
drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +-
drivers/net/vhost/rte_eth_vhost.c | 2 +-
drivers/net/virtio/virtio_user_ethdev.c | 2 +-
drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +-
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +-
drivers/raw/ifpga/ifpga_rawdev.c | 2 +-
drivers/raw/skeleton/skeleton_rawdev.c | 2 +-
drivers/raw/skeleton/skeleton_rawdev_test.c | 2 +-
lib/ethdev/ethdev_vdev.h | 2 +-
lib/eventdev/eventdev_pmd_vdev.h | 2 +-
61 files changed, 216 insertions(+), 190 deletions(-)
create mode 100644 drivers/bus/vdev/bus_vdev_driver.h
diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 9e39993e90..0b71e9329b 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -7,9 +7,9 @@
#include <string.h>
#include <bus_driver.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
#include "test.h"
diff --git a/drivers/baseband/la12xx/bbdev_la12xx.c
b/drivers/baseband/la12xx/bbdev_la12xx.c
index 4d1bd16751..f0927d9fca 100644
--- a/drivers/baseband/la12xx/bbdev_la12xx.c
+++ b/drivers/baseband/la12xx/bbdev_la12xx.c
@@ -10,7 +10,7 @@
#include <dirent.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
diff --git a/drivers/baseband/null/bbdev_null.c
b/drivers/baseband/null/bbdev_null.c
index 248e12987f..e76ef2313f 100644
--- a/drivers/baseband/null/bbdev_null.c
+++ b/drivers/baseband/null/bbdev_null.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index af7bc416f9..e8d0c43e6f 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
diff --git a/drivers/bus/vdev/bus_vdev_driver.h
b/drivers/bus/vdev/bus_vdev_driver.h
new file mode 100644
index 0000000000..36748cdfae
--- /dev/null
+++ b/drivers/bus/vdev/bus_vdev_driver.h
@@ -0,0 +1,151 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016 RehiveTech. All rights reserved.
+ */
+
+#ifndef BUS_VDEV_DRIVER_H
+#define BUS_VDEV_DRIVER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_bus_vdev.h>
+#include <rte_compat.h>
+#include <rte_dev.h>
+#include <rte_devargs.h>
+
+struct rte_vdev_device {
+ RTE_TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
+ struct rte_device device; /**< Inherit core device */
+};
+
+/**
+ * @internal
+ * Helper macro for drivers that need to convert to struct rte_vdev_device.
+ */
+#define RTE_DEV_TO_VDEV(ptr) \
+ container_of(ptr, struct rte_vdev_device, device)
+
+#define RTE_DEV_TO_VDEV_CONST(ptr) \
+ container_of(ptr, const struct rte_vdev_device, device)
+
+#define RTE_ETH_DEV_TO_VDEV(eth_dev) RTE_DEV_TO_VDEV((eth_dev)->device)
+
+static inline const char *
+rte_vdev_device_name(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.name)
+ return dev->device.name;
+ return NULL;
+}
+
+static inline const char *
+rte_vdev_device_args(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.devargs)
+ return dev->device.devargs->args;
+ return "";
+}
+
+/**
+ * Probe function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_probe_t)(struct rte_vdev_device *dev);
+
+/**
+ * Remove function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_remove_t)(struct rte_vdev_device *dev);
+
+/**
+ * Driver-specific DMA mapping. After a successful call the device
+ * will be able to read/write from/to this segment.
+ *
+ * @param dev
+ * Pointer to the Virtual device.
+ * @param addr
+ * Starting virtual address of memory to be mapped.
+ * @param iova
+ * Starting IOVA address of memory to be mapped.
+ * @param len
+ * Length of memory segment being mapped.
+ * @return
+ * - 0 On success.
+ * - Negative value and rte_errno is set otherwise.
+ */
+typedef int (rte_vdev_dma_map_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
+/**
+ * Driver-specific DMA un-mapping. After a successful call the device
+ * will not be able to read/write from/to this segment.
+ *
+ * @param dev
+ * Pointer to the Virtual device.
+ * @param addr
+ * Starting virtual address of memory to be unmapped.
+ * @param iova
+ * Starting IOVA address of memory to be unmapped.
+ * @param len
+ * Length of memory segment being unmapped.
+ * @return
+ * - 0 On success.
+ * - Negative value and rte_errno is set otherwise.
+ */
+typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
+/**
+ * A virtual device driver abstraction.
+ */
+struct rte_vdev_driver {
+ RTE_TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
+ 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. */
+ rte_vdev_dma_map_t *dma_map; /**< Virtual device DMA map function.
*/
+ rte_vdev_dma_unmap_t *dma_unmap; /**< Virtual device DMA unmap
function. */
+ uint32_t drv_flags; /**< Flags RTE_VDEV_DRV_*. */
+};
+
+/** Device driver needs IOVA as VA and cannot work with IOVA as PA */
+#define RTE_VDEV_DRV_NEED_IOVA_AS_VA 0x0001
+
+/**
+ * Register a virtual device driver.
+ *
+ * @param driver
+ * A pointer to a rte_vdev_driver structure describing the driver
+ * to be registered.
+ */
+__rte_internal
+void rte_vdev_register(struct rte_vdev_driver *driver);
+
+/**
+ * Unregister a virtual device driver.
+ *
+ * @param driver
+ * A pointer to a rte_vdev_driver structure describing the driver
+ * to be unregistered.
+ */
+__rte_internal
+void rte_vdev_unregister(struct rte_vdev_driver *driver);
+
+#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
+static const char *vdrvinit_ ## nm ## _alias;\
+RTE_INIT(vdrvinitfn_ ##vdrv)\
+{\
+ (vdrv).driver.name = RTE_STR(nm);\
+ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
+ rte_vdev_register(&vdrv);\
+} \
+RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
+
+#define RTE_PMD_REGISTER_ALIAS(nm, alias)\
+static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BUS_VDEV_DRIVER_H */
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 8adf674530..1532ed4f35 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -6,5 +6,6 @@ sources = files(
'vdev_params.c',
)
headers = files('rte_bus_vdev.h')
+driver_sdk_headers = files('bus_vdev_driver.h')
deps += ['kvargs']
diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h
index ce20faf649..f48dd24e5e 100644
--- a/drivers/bus/vdev/rte_bus_vdev.h
+++ b/drivers/bus/vdev/rte_bus_vdev.h
@@ -15,137 +15,6 @@
extern "C" {
#endif
-#include <rte_dev.h>
-#include <rte_devargs.h>
-
-struct rte_vdev_device {
- RTE_TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
- struct rte_device device; /**< Inherit core device */
-};
-
-/**
- * @internal
- * Helper macro for drivers that need to convert to struct rte_vdev_device.
- */
-#define RTE_DEV_TO_VDEV(ptr) \
- container_of(ptr, struct rte_vdev_device, device)
-
-#define RTE_DEV_TO_VDEV_CONST(ptr) \
- container_of(ptr, const struct rte_vdev_device, device)
-
-#define RTE_ETH_DEV_TO_VDEV(eth_dev) RTE_DEV_TO_VDEV((eth_dev)->device)
-
-static inline const char *
-rte_vdev_device_name(const struct rte_vdev_device *dev)
-{
- if (dev && dev->device.name)
- return dev->device.name;
- return NULL;
-}
-
-static inline const char *
-rte_vdev_device_args(const struct rte_vdev_device *dev)
-{
- if (dev && dev->device.devargs)
- return dev->device.devargs->args;
- return "";
-}
-
-/**
- * Probe function called for each virtual device driver once.
- */
-typedef int (rte_vdev_probe_t)(struct rte_vdev_device *dev);
-
-/**
- * Remove function called for each virtual device driver once.
- */
-typedef int (rte_vdev_remove_t)(struct rte_vdev_device *dev);
-
-/**
- * Driver-specific DMA mapping. After a successful call the device
- * will be able to read/write from/to this segment.
- *
- * @param dev
- * Pointer to the Virtual device.
- * @param addr
- * Starting virtual address of memory to be mapped.
- * @param iova
- * Starting IOVA address of memory to be mapped.
- * @param len
- * Length of memory segment being mapped.
- * @return
- * - 0 On success.
- * - Negative value and rte_errno is set otherwise.
- */
-typedef int (rte_vdev_dma_map_t)(struct rte_vdev_device *dev, void *addr,
- uint64_t iova, size_t len);
-
-/**
- * Driver-specific DMA un-mapping. After a successful call the device
- * will not be able to read/write from/to this segment.
- *
- * @param dev
- * Pointer to the Virtual device.
- * @param addr
- * Starting virtual address of memory to be unmapped.
- * @param iova
- * Starting IOVA address of memory to be unmapped.
- * @param len
- * Length of memory segment being unmapped.
- * @return
- * - 0 On success.
- * - Negative value and rte_errno is set otherwise.
- */
-typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr,
- uint64_t iova, size_t len);
-
-/**
- * A virtual device driver abstraction.
- */
-struct rte_vdev_driver {
- RTE_TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
- 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. */
- rte_vdev_dma_map_t *dma_map; /**< Virtual device DMA map function.
*/
- rte_vdev_dma_unmap_t *dma_unmap; /**< Virtual device DMA unmap
function. */
- uint32_t drv_flags; /**< Flags RTE_VDEV_DRV_*. */
-};
-
-/** Device driver needs IOVA as VA and cannot work with IOVA as PA */
-#define RTE_VDEV_DRV_NEED_IOVA_AS_VA 0x0001
-
-/**
- * Register a virtual device driver.
- *
- * @param driver
- * A pointer to a rte_vdev_driver structure describing the driver
- * to be registered.
- */
-void rte_vdev_register(struct rte_vdev_driver *driver);
-
-/**
- * Unregister a virtual device driver.
- *
- * @param driver
- * A pointer to a rte_vdev_driver structure describing the driver
- * to be unregistered.
- */
-void rte_vdev_unregister(struct rte_vdev_driver *driver);
-
-#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
-static const char *vdrvinit_ ## nm ## _alias;\
-RTE_INIT(vdrvinitfn_ ##vdrv)\
-{\
- (vdrv).driver.name = RTE_STR(nm);\
- (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
- rte_vdev_register(&vdrv);\
-} \
-RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
-
-#define RTE_PMD_REGISTER_ALIAS(nm, alias)\
-static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
-
typedef void (*rte_vdev_scan_callback)(void *user_arg);
/**
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index ee569fcdf2..1b8410fe5b 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -11,6 +11,7 @@
#include <sys/queue.h>
#include <bus_driver.h>
+#include <bus_vdev_driver.h>
#include <rte_eal.h>
#include <rte_dev.h>
#include <rte_common.h>
@@ -21,7 +22,6 @@
#include <rte_string_fns.h>
#include <rte_errno.h>
-#include "rte_bus_vdev.h"
#include "vdev_logs.h"
#include "vdev_private.h"
diff --git a/drivers/bus/vdev/version.map b/drivers/bus/vdev/version.map
index 0d60b7e2bc..594646d550 100644
--- a/drivers/bus/vdev/version.map
+++ b/drivers/bus/vdev/version.map
@@ -3,10 +3,15 @@ DPDK_22 {
rte_vdev_add_custom_scan;
rte_vdev_init;
- rte_vdev_register;
rte_vdev_remove_custom_scan;
rte_vdev_uninit;
- rte_vdev_unregister;
local: *;
};
+
+INTERNAL {
+ global:
+
+ rte_vdev_register;
+ rte_vdev_unregister;
+};
diff --git a/drivers/compress/isal/isal_compress_pmd.c
b/drivers/compress/isal/isal_compress_pmd.c
index b7ba61c434..cb23e929ed 100644
--- a/drivers/compress/isal/isal_compress_pmd.c
+++ b/drivers/compress/isal/isal_compress_pmd.c
@@ -3,7 +3,7 @@
*/
#include <isa-l.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cpuflags.h>
#include <rte_malloc.h>
diff --git a/drivers/compress/zlib/zlib_pmd.c b/drivers/compress/zlib/zlib_pmd.c
index 0220c6d038..98abd41013 100644
--- a/drivers/compress/zlib/zlib_pmd.c
+++ b/drivers/compress/zlib/zlib_pmd.c
@@ -2,7 +2,7 @@
* Copyright(c) 2018 Cavium Networks
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include "zlib_pmd_private.h"
diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c
b/drivers/crypto/armv8/rte_armv8_pmd.c
index 32127a874c..5c060e71a3 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -8,7 +8,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
diff --git a/drivers/crypto/bcmfs/bcmfs_device.h
b/drivers/crypto/bcmfs/bcmfs_device.h
index 4901a6cfd9..610454dd5e 100644
--- a/drivers/crypto/bcmfs/bcmfs_device.h
+++ b/drivers/crypto/bcmfs/bcmfs_device.h
@@ -9,7 +9,7 @@
#include <sys/queue.h>
#include <rte_spinlock.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "bcmfs_logs.h"
#include "bcmfs_qp.h"
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 8e9cfe73d8..8c0b4909cf 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -12,7 +12,7 @@
#include <cryptodev_pmd.h>
#include <rte_crypto.h>
#include <rte_cryptodev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_security_driver.h>
#include <rte_hexdump.h>
diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c
index 4957f11e97..6c3e45e333 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -4,7 +4,7 @@
#include <rte_string_fns.h>
#include <bus_pci_driver.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.c
b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
index aab42c360c..2e7347fa79 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
@@ -2,7 +2,7 @@
* Copyright(c) 2021 Intel Corporation
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cryptodev.h>
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.h
b/drivers/crypto/ipsec_mb/ipsec_mb_private.h
index e2c240dfc0..d0d4258ee1 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.h
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.h
@@ -7,7 +7,7 @@
#include <intel-ipsec-mb.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#if defined(RTE_LIB_SECURITY)
#define IPSEC_MB_DOCSIS_SEC_ENABLED 1
diff --git a/drivers/crypto/ipsec_mb/pmd_kasumi.c
b/drivers/crypto/ipsec_mb/pmd_kasumi.c
index c9d4f9d0ae..fba10b8cf4 100644
--- a/drivers/crypto/ipsec_mb/pmd_kasumi.c
+++ b/drivers/crypto/ipsec_mb/pmd_kasumi.c
@@ -2,7 +2,7 @@
* Copyright(c) 2016-2021 Intel Corporation
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cpuflags.h>
#include <rte_cryptodev.h>
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c
b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 04efd9aaa8..c35876c8b4 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -9,7 +9,7 @@
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
#include <rte_security_driver.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
#include <rte_kvargs.h>
diff --git a/drivers/crypto/null/null_crypto_pmd.c
b/drivers/crypto/null/null_crypto_pmd.c
index 9ecb434fd0..eab74ad45f 100644
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -4,7 +4,7 @@
#include <rte_common.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include "null_crypto_pmd_private.h"
diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c
b/drivers/crypto/openssl/rte_openssl_pmd.c
index e01dacc98d..ed6d215f1b 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -6,7 +6,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
diff --git a/drivers/crypto/scheduler/scheduler_pmd.c
b/drivers/crypto/scheduler/scheduler_pmd.c
index dd198080bf..a15c02b4d8 100644
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -5,7 +5,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
#include <rte_reorder.h>
diff --git a/drivers/dma/skeleton/skeleton_dmadev.c
b/drivers/dma/skeleton/skeleton_dmadev.c
index 82b4661323..09068a9521 100644
--- a/drivers/dma/skeleton/skeleton_dmadev.c
+++ b/drivers/dma/skeleton/skeleton_dmadev.c
@@ -4,7 +4,7 @@
#include <inttypes.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_cycles.h>
#include <rte_eal.h>
#include <rte_kvargs.h>
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c
b/drivers/event/dpaa2/dpaa2_eventdev.c
index 5de3e9e5f5..08df6e223a 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -23,7 +23,7 @@
#include <rte_memcpy.h>
#include <rte_memory.h>
#include <rte_pci.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <ethdev_driver.h>
#include <cryptodev_pmd.h>
#include <rte_event_eth_rx_adapter.h>
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
index 941fb8fc43..427aff4b11 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
@@ -17,7 +17,7 @@
#include <rte_lcore.h>
#include <rte_per_lcore.h>
#include <rte_random.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
#include <bus_fslmc_driver.h>
diff --git a/drivers/event/octeontx/ssovf_evdev.c
b/drivers/event/octeontx/ssovf_evdev.c
index 9e14e35d10..fe157c59d5 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -16,7 +16,7 @@
#include <rte_log.h>
#include <rte_malloc.h>
#include <rte_memory.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "ssovf_evdev.h"
#include "timvf_evdev.h"
diff --git a/drivers/event/octeontx/ssovf_evdev_selftest.c
b/drivers/event/octeontx/ssovf_evdev_selftest.c
index b55523632a..3dbf31efa9 100644
--- a/drivers/event/octeontx/ssovf_evdev_selftest.c
+++ b/drivers/event/octeontx/ssovf_evdev_selftest.c
@@ -17,7 +17,7 @@
#include <rte_lcore.h>
#include <rte_per_lcore.h>
#include <rte_random.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
#include "ssovf_evdev.h"
diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index 8b6890b220..368e5a9657 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_lcore.h>
#include <rte_memzone.h>
#include <rte_kvargs.h>
diff --git a/drivers/event/opdl/opdl_evdev_init.c
b/drivers/event/opdl/opdl_evdev_init.c
index 15aae47524..be3437fc2f 100644
--- a/drivers/event/opdl/opdl_evdev_init.c
+++ b/drivers/event/opdl/opdl_evdev_init.c
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_errno.h>
#include <rte_cycles.h>
#include <rte_memzone.h>
diff --git a/drivers/event/opdl/opdl_test.c b/drivers/event/opdl/opdl_test.c
index 24b92df476..50c12a18b0 100644
--- a/drivers/event/opdl/opdl_test.c
+++ b/drivers/event/opdl/opdl_test.c
@@ -19,7 +19,7 @@
#include <rte_ethdev.h>
#include <rte_cycles.h>
#include <rte_eventdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_pause.h>
#include "opdl_evdev.h"
diff --git a/drivers/event/skeleton/skeleton_eventdev.c
b/drivers/event/skeleton/skeleton_eventdev.c
index bf3b01ebc8..6bd8fec6d4 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -18,7 +18,7 @@
#include <rte_malloc.h>
#include <rte_memory.h>
#include <rte_lcore.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "skeleton_eventdev.h"
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index f93313b31b..22cba1e74b 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_ring.h>
#include <rte_errno.h>
diff --git a/drivers/event/sw/sw_evdev_selftest.c
b/drivers/event/sw/sw_evdev_selftest.c
index cb97a4d615..59bcdf5734 100644
--- a/drivers/event/sw/sw_evdev_selftest.c
+++ b/drivers/event/sw/sw_evdev_selftest.c
@@ -21,7 +21,7 @@
#include <rte_pause.h>
#include <rte_service.h>
#include <rte_service_component.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "sw_evdev.h"
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
b/drivers/net/af_packet/rte_eth_af_packet.c
index 1396f32c3d..e2771e6765 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -12,7 +12,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <errno.h>
#include <linux/if_ether.h>
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index fce649c2a1..fd7be47311 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -20,7 +20,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_branch_prediction.h>
#include <rte_common.h>
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 4ac191c468..b44dd219cb 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -8,7 +8,7 @@
#include <rte_malloc.h>
#include <ethdev_driver.h>
#include <rte_tcp.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include "rte_eth_bond.h"
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 73e6972035..cd80a0af46 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -15,7 +15,7 @@
#include <rte_ip_frag.h>
#include <rte_devargs.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
#include <rte_string_fns.h>
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 7fe77cfe8e..32811403b4 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -12,7 +12,7 @@
#include <rte_devargs.h>
#include <rte_kvargs.h>
#include <bus_driver.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "failsafe_private.h"
diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h
b/drivers/net/ipn3ke/ipn3ke_ethdev.h
index dbf57f9ba8..4b93d2649e 100644
--- a/drivers/net/ipn3ke/ipn3ke_ethdev.h
+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h
@@ -19,7 +19,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 0532de5315..c0e1f8db40 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -12,7 +12,7 @@
#include <rte_kni.h>
#include <rte_kvargs.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
/* Only single queue supported */
#define KNI_MAX_QUEUE_PER_PORT 1
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 7886644412..4700ce2e77 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -17,7 +17,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_hash.h>
#include <rte_jhash.h>
#include <rte_string_fns.h>
diff --git a/drivers/net/memif/rte_eth_memif.c
b/drivers/net/memif/rte_eth_memif.c
index dd951b8296..a574bce49e 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -21,7 +21,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_errno.h>
#include <rte_memory.h>
diff --git a/drivers/net/mvneta/mvneta_ethdev.c
b/drivers/net/mvneta/mvneta_ethdev.c
index eef016aa0b..6a0dd6091d 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -7,7 +7,7 @@
#include <rte_string_fns.h>
#include <ethdev_driver.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 735efb6cfc..310e3e5acf 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -9,7 +9,7 @@
#include <rte_kvargs.h>
#include <rte_log.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <fcntl.h>
#include <linux/ethtool.h>
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index bb89c1abc4..a517376d40 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -8,7 +8,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
diff --git a/drivers/net/octeontx/octeontx_ethdev.c
b/drivers/net/octeontx/octeontx_ethdev.c
index 3aca53fb98..9ada22e2ff 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -12,7 +12,7 @@
#include <eventdev_pmd.h>
#include <rte_alarm.h>
#include <rte_branch_prediction.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_cycles.h>
#include <rte_debug.h>
#include <rte_dev.h>
diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
index ec29fd6bc5..7fb4abb20b 100644
--- a/drivers/net/pcap/pcap_ethdev.c
+++ b/drivers/net/pcap/pcap_ethdev.c
@@ -15,7 +15,7 @@
#include <rte_malloc.h>
#include <rte_mbuf.h>
#include <rte_mbuf_dyn.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_os_shim.h>
#include "pcap_osdep.h"
diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index c2991ab1cc..0352a57950 100644
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -6,7 +6,7 @@
#include <sys/epoll.h>
#include <rte_kvargs.h>
#include <ethdev_vdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_ether.h>
#include <dpaa_of.h>
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index cfb81da5fe..37e7ccfda0 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -8,7 +8,7 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_string_fns.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_errno.h>
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index 8c098cad5b..fa89940735 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -9,7 +9,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_errno.h>
#include <rte_ring.h>
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 9e1032fe72..d047489e94 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -10,7 +10,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_net.h>
#include <rte_debug.h>
diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c
b/drivers/net/vdev_netvsc/vdev_netvsc.c
index 9d65f75048..5c7430718b 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -25,7 +25,7 @@
#include <bus_driver.h>
#include <rte_alarm.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_dev.h>
#include <rte_errno.h>
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 7e512d94bf..6c81967c6f 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -13,7 +13,7 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_net.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_vhost.h>
#include <rte_spinlock.h>
diff --git a/drivers/net/virtio/virtio_user_ethdev.c
b/drivers/net/virtio/virtio_user_ethdev.c
index a7d7063c2a..3edfd7439e 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -14,7 +14,7 @@
#include <rte_malloc.h>
#include <rte_kvargs.h>
#include <ethdev_vdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c
b/drivers/raw/cnxk_gpio/cnxk_gpio.c
index d759ed82d4..e2907c18b5 100644
--- a/drivers/raw/cnxk_gpio/cnxk_gpio.c
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c
@@ -6,7 +6,7 @@
#include <string.h>
#include <sys/stat.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_eal.h>
#include <rte_kvargs.h>
#include <rte_lcore.h>
diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
index c7bddbc6cc..aeee4ac289 100644
--- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
+++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
@@ -6,7 +6,7 @@
#include <errno.h>
#include <stdint.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_atomic.h>
#include <rte_interrupts.h>
#include <rte_branch_prediction.h>
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index f6e07dc37b..dea68d5764 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -26,7 +26,7 @@
#include <rte_memzone.h>
#include <rte_eal.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_pmd_i40e.h>
diff --git a/drivers/raw/skeleton/skeleton_rawdev.c
b/drivers/raw/skeleton/skeleton_rawdev.c
index 16ecae3d92..19b523a815 100644
--- a/drivers/raw/skeleton/skeleton_rawdev.c
+++ b/drivers/raw/skeleton/skeleton_rawdev.c
@@ -21,7 +21,7 @@
#include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_lcore.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_rawdev.h>
#include <rte_rawdev_pmd.h>
diff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c
b/drivers/raw/skeleton/skeleton_rawdev_test.c
index 693b24c415..fc257c5f44 100644
--- a/drivers/raw/skeleton/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c
@@ -8,7 +8,7 @@
#include <rte_memcpy.h>
#include <rte_dev.h>
#include <rte_rawdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
/* Using relative path as skeleton_rawdev is not part of exported headers */
diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
index f5f536ce64..364f140f91 100644
--- a/lib/ethdev/ethdev_vdev.h
+++ b/lib/ethdev/ethdev_vdev.h
@@ -12,7 +12,7 @@ extern "C" {
#include <rte_config.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <ethdev_driver.h>
/**
diff --git a/lib/eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
index 77904910a2..cf2333cf41 100644
--- a/lib/eventdev/eventdev_pmd_vdev.h
+++ b/lib/eventdev/eventdev_pmd_vdev.h
@@ -22,7 +22,7 @@ extern "C" {
#include <rte_config.h>
#include <rte_debug.h>
#include <rte_eal.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "eventdev_pmd.h"
--
2.36.1
