@@ -517,9 +517,9 @@ aesni_gcm_uninit(const char *name)
static struct rte_vdev_driver aesni_gcm_pmd_drv = {
.driver = {
.type = PMD_VDEV,
- .init = aesni_gcm_init,
- .uninit = aesni_gcm_uninit
},
+ .init = aesni_gcm_init,
+ .uninit = aesni_gcm_uninit
};
DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD, aesni_gcm_pmd_drv);
@@ -717,9 +717,9 @@ cryptodev_aesni_mb_uninit(const char *name)
static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = {
.driver = {
.type = PMD_VDEV,
- .init = cryptodev_aesni_mb_init,
- .uninit = cryptodev_aesni_mb_uninit
},
+ .init = cryptodev_aesni_mb_init,
+ .uninit = cryptodev_aesni_mb_uninit
};
DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD, cryptodev_aesni_mb_pmd_drv);
@@ -653,9 +653,9 @@ cryptodev_kasumi_uninit(const char *name)
static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {
.driver = {
.type = PMD_VDEV,
- .init = cryptodev_kasumi_init,
- .uninit = cryptodev_kasumi_uninit
},
+ .init = cryptodev_kasumi_init,
+ .uninit = cryptodev_kasumi_uninit
};
DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv);
@@ -271,9 +271,9 @@ cryptodev_null_uninit(const char *name)
static struct rte_vdev_driver cryptodev_null_pmd_drv = {
.driver = {
.type = PMD_VDEV,
- .init = cryptodev_null_init,
- .uninit = cryptodev_null_uninit
},
+ .init = cryptodev_null_init,
+ .uninit = cryptodev_null_uninit
};
DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv);
@@ -641,9 +641,9 @@ cryptodev_snow3g_uninit(const char *name)
static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {
.driver = {
.type = PMD_VDEV,
- .init = cryptodev_snow3g_init,
- .uninit = cryptodev_snow3g_uninit
},
+ .init = cryptodev_snow3g_init,
+ .uninit = cryptodev_snow3g_uninit
};
DRIVER_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv);
@@ -892,9 +892,9 @@ rte_pmd_af_packet_devuninit(const char *name)
static struct rte_vdev_driver pmd_af_packet_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_af_packet_devinit,
- .uninit = rte_pmd_af_packet_devuninit
},
+ .init = rte_pmd_af_packet_devinit,
+ .uninit = rte_pmd_af_packet_devuninit
};
DRIVER_REGISTER_VDEV(eth_af_packet, pmd_af_packet_drv);
@@ -2511,9 +2511,9 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
static struct rte_vdev_driver bond_drv = {
.driver = {
.type = PMD_VDEV,
- .init = bond_init,
- .uninit = bond_uninit
},
+ .init = bond_init,
+ .uninit = bond_uninit
};
DRIVER_REGISTER_VDEV(eth_bond, bond_drv);
@@ -1626,15 +1626,15 @@ rte_pmd_mpipe_devinit(const char *ifname,
static struct rte_vdev_driver pmd_mpipe_xgbe_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit
},
+ .init = rte_pmd_mpipe_devinit
};
static struct rte_vdev_driver pmd_mpipe_gbe_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit
},
+ .init = rte_pmd_mpipe_devinit
};
DRIVER_REGISTER_VDEV(xgbe, pmd_mpipe_xgbe_drv);
@@ -689,9 +689,9 @@ rte_pmd_null_devuninit(const char *name)
static struct rte_vdev_driver pmd_null_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_null_devinit,
- .uninit = rte_pmd_null_devuninit
},
+ .init = rte_pmd_null_devinit,
+ .uninit = rte_pmd_null_devuninit
};
DRIVER_REGISTER_VDEV(eth_null, pmd_null_drv);
@@ -1086,9 +1086,9 @@ rte_pmd_pcap_devuninit(const char *name)
static struct rte_vdev_driver pmd_pcap_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_pcap_devinit,
- .uninit = rte_pmd_pcap_devuninit
},
+ .init = rte_pmd_pcap_devinit,
+ .uninit = rte_pmd_pcap_devuninit
};
DRIVER_REGISTER_VDEV(eth_pcap, pmd_pcap_drv);
@@ -626,9 +626,9 @@ rte_pmd_ring_devuninit(const char *name)
static struct rte_vdev_driver pmd_ring_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_ring_devinit,
- .uninit = rte_pmd_ring_devuninit
},
+ .init = rte_pmd_ring_devinit,
+ .uninit = rte_pmd_ring_devuninit
};
DRIVER_REGISTER_VDEV(eth_ring, pmd_ring_drv);
@@ -927,9 +927,9 @@ rte_pmd_vhost_devuninit(const char *name)
static struct rte_vdev_driver pmd_vhost_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_vhost_devinit,
- .uninit = rte_pmd_vhost_devuninit
},
+ .init = rte_pmd_vhost_devinit,
+ .uninit = rte_pmd_vhost_devuninit
};
DRIVER_REGISTER_VDEV(eth_vhost, pmd_vhost_drv);
@@ -465,9 +465,9 @@ virtio_user_pmd_devuninit(const char *name)
static struct rte_vdev_driver virtio_user_driver = {
.driver = {
.type = PMD_VDEV,
- .init = virtio_user_pmd_devinit,
- .uninit = virtio_user_pmd_devuninit
},
+ .init = virtio_user_pmd_devinit,
+ .uninit = virtio_user_pmd_devuninit
};
DRIVER_REGISTER_VDEV(virtio_user, virtio_user_driver);
@@ -762,9 +762,9 @@ rte_pmd_xenvirt_devuninit(const char *name)
static struct rte_vdev_driver pmd_xenvirt_drv = {
.driver = {
.type = PMD_VDEV,
- .init = rte_pmd_xenvirt_devinit,
- .uninit = rte_pmd_xenvirt_devuninit
},
+ .init = rte_pmd_xenvirt_devinit,
+ .uninit = rte_pmd_xenvirt_devuninit
};
DRIVER_REGISTER_VDEV(eth_xenvirt, pmd_xenvirt_drv);
@@ -73,7 +73,7 @@ rte_eal_vdev_init(const char *name, const char *args)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name, strlen(driver->driver.name)))
- return driver->driver.init(name, args);
+ return driver->init(name, args);
}
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
@@ -96,7 +96,7 @@ rte_eal_vdev_uninit(const char *name)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name, strlen(driver->driver.name)))
- return driver->driver.uninit(name);
+ return driver->uninit(name);
}
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
@@ -105,16 +105,6 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
TAILQ_HEAD(rte_driver_list, rte_driver);
/**
- * Initialization function called for each device driver once.
- */
-typedef int (rte_dev_init_t)(const char *name, const char *args);
-
-/**
- * Uninitilization function called for each device driver once.
- */
-typedef int (rte_dev_uninit_t)(const char *name);
-
-/**
* Driver type enumeration
*/
enum pmd_type {
@@ -129,8 +119,6 @@ struct rte_driver {
TAILQ_ENTRY(rte_driver) next; /**< Next in list. */
enum pmd_type type; /**< PMD Driver type */
const char *name; /**< Driver name. */
- rte_dev_init_t *init; /**< Device init. function. */
- rte_dev_uninit_t *uninit; /**< Device uninit. function. */
};
/**
@@ -44,11 +44,23 @@ extern "C" {
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
/**
+ * Initialization function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_init_t)(const char *name, const char *args);
+
+/**
+ * Uninitilization function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_uninit_t)(const char *name);
+
+/**
* A virtual device driver abstraction.
*/
struct rte_vdev_driver {
TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
struct rte_driver driver; /**< Inherited general driver. */
+ rte_vdev_init_t *init; /**< Virtual device init. function. */
+ rte_vdev_uninit_t *uninit; /**< Virtual device uninit. function. */
};
/**