eal: add name field to generic device

[dpdk.git] / lib / librte_eal / common / eal_common_vdev.c

diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 70da608..c922297 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -76,7 +76,6 @@ static int
 vdev_probe_all_drivers(struct rte_vdev_device *dev)
 {
        const char *name = rte_vdev_device_name(dev);
-       const char *args = rte_vdev_device_args(dev);
        struct rte_vdev_driver *driver;
        int ret;
 
@@ -90,7 +89,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
                if (!strncmp(driver->driver.name, name,
                            strlen(driver->driver.name))) {
                        dev->device.driver = &driver->driver;
-                       ret = driver->probe(name, args);
+                       ret = driver->probe(dev);
                        if (ret)
                                dev->device.driver = NULL;
                        return ret;
@@ -103,7 +102,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
                    !strncmp(driver->driver.alias, name,
                            strlen(driver->driver.alias))) {
                        dev->device.driver = &driver->driver;
-                       ret = driver->probe(name, args);
+                       ret = driver->probe(dev);
                        if (ret)
                                dev->device.driver = NULL;
                        return ret;
@@ -181,6 +180,7 @@ rte_eal_vdev_init(const char *name, const char *args)
 
        dev->device.devargs = devargs;
        dev->device.numa_node = SOCKET_ID_ANY;
+       dev->device.name = devargs->virt.drv_name;
 
        ret = vdev_probe_all_drivers(dev);
        if (ret) {
@@ -215,7 +215,7 @@ vdev_remove_driver(struct rte_vdev_device *dev)
 
        driver = container_of(dev->device.driver, const struct rte_vdev_driver,
                driver);
-       return driver->remove(name);
+       return driver->remove(dev);
 }
 
 int
@@ -272,6 +272,7 @@ vdev_scan(void)
 
                dev->device.devargs = devargs;
                dev->device.numa_node = SOCKET_ID_ANY;
+               dev->device.name = devargs->virt.drv_name;
 
                rte_eal_device_insert(&dev->device);
                TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);