bus/vdev: move code from EAL into a new driver

[dpdk.git] / drivers / net / kni / rte_eth_kni.c

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index e3ce572..8f26953 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -36,10 +36,11 @@
 #include <unistd.h>
 
 #include <rte_ethdev.h>
+#include <rte_ethdev_vdev.h>
 #include <rte_kni.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
-#include <rte_vdev.h>
+#include <rte_bus_vdev.h>
 
 /* Only single queue supported */
 #define KNI_MAX_QUEUE_PER_PORT 1
@@ -144,7 +145,7 @@ eth_kni_start(struct rte_eth_dev *dev)
        uint16_t port_id = dev->data->port_id;
        struct rte_mempool *mb_pool;
        struct rte_kni_conf conf;
-       const char *name = dev->data->name + 4; /* remove net_ */
+       const char *name = dev->device->name + 4; /* remove net_ */
 
        snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name);
        conf.force_bind = 0;
@@ -282,7 +283,7 @@ eth_kni_link_update(struct rte_eth_dev *dev __rte_unused,
        return 0;
 }
 
-static void
+static int
 eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        unsigned long rx_packets_total = 0, rx_bytes_total = 0;
@@ -319,6 +320,8 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        stats->opackets = tx_packets_total;
        stats->obytes = tx_bytes_total;
        stats->oerrors = tx_packets_err_total;
+
+       return 0;
 }
 
 static void
@@ -355,35 +358,33 @@ static const struct eth_dev_ops eth_kni_ops = {
        .stats_reset = eth_kni_stats_reset,
 };
 
-static struct rte_vdev_driver eth_kni_drv;
-
 static struct rte_eth_dev *
-eth_kni_create(const char *name, struct eth_kni_args *args,
+eth_kni_create(struct rte_vdev_device *vdev,
+               struct eth_kni_args *args,
                unsigned int numa_node)
 {
-       struct pmd_internals *internals = NULL;
+       struct pmd_internals *internals;
        struct rte_eth_dev_data *data;
        struct rte_eth_dev *eth_dev;
+       const char *name;
 
        RTE_LOG(INFO, PMD, "Creating kni ethdev on numa socket %u\n",
                        numa_node);
 
+       name = rte_vdev_device_name(vdev);
        data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
        if (data == NULL)
-               goto error;
-
-       internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
-       if (internals == NULL)
-               goto error;
+               return NULL;
 
        /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate(name);
-       if (eth_dev == NULL)
-               goto error;
+       eth_dev = rte_eth_vdev_allocate(vdev, sizeof(*internals));
+       if (eth_dev == NULL) {
+               rte_free(data);
+               return NULL;
+       }
 
-       data->dev_private = internals;
-       data->port_id = eth_dev->data->port_id;
-       memmove(data->name, eth_dev->data->name, sizeof(data->name));
+       internals = eth_dev->data->dev_private;
+       rte_memcpy(data, eth_dev->data, sizeof(*data));
        data->nb_rx_queues = 1;
        data->nb_tx_queues = 1;
        data->dev_link = pmd_link;
@@ -393,22 +394,10 @@ eth_kni_create(const char *name, struct eth_kni_args *args,
 
        eth_dev->data = data;
        eth_dev->dev_ops = &eth_kni_ops;
-       eth_dev->device->driver = NULL;
-
-       data->dev_flags = RTE_ETH_DEV_DETACHABLE;
-       data->kdrv = RTE_KDRV_NONE;
-       data->drv_name = eth_kni_drv.driver.name;
-       data->numa_node = numa_node;
 
        internals->no_request_thread = args->no_request_thread;
 
        return eth_dev;
-
-error:
-       rte_free(data);
-       rte_free(internals);
-
-       return NULL;
 }
 
 static int
@@ -462,7 +451,7 @@ eth_kni_probe(struct rte_vdev_device *vdev)
        if (ret < 0)
                return ret;
 
-       eth_dev = eth_kni_create(name, &args, rte_socket_id());
+       eth_dev = eth_kni_create(vdev, &args, rte_socket_id());
        if (eth_dev == NULL)
                goto kni_uninit;
 
@@ -495,12 +484,10 @@ eth_kni_remove(struct rte_vdev_device *vdev)
 
        eth_kni_dev_stop(eth_dev);
 
-       if (eth_dev->data) {
-               internals = eth_dev->data->dev_private;
-               rte_kni_release(internals->kni);
+       internals = eth_dev->data->dev_private;
+       rte_kni_release(internals->kni);
 
-               rte_free(internals);
-       }
+       rte_free(internals);
        rte_free(eth_dev->data);
 
        rte_eth_dev_release_port(eth_dev);