eal: add function to query device status

[dpdk.git] / drivers / bus / vdev / vdev.c

diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 69dee89..f666099 100644 (file)
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -23,6 +23,7 @@
 
 #include "rte_bus_vdev.h"
 #include "vdev_logs.h"
+#include "vdev_private.h"
 
 #define VDEV_MP_KEY    "bus_vdev_mp"
 
@@ -149,10 +150,9 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
 
        if (vdev_parse(name, &driver))
                return -1;
-       dev->device.driver = &driver->driver;
        ret = driver->probe(dev);
-       if (ret)
-               dev->device.driver = NULL;
+       if (ret == 0)
+               dev->device.driver = &driver->driver;
        return ret;
 }
 
@@ -248,7 +248,6 @@ int
 rte_vdev_init(const char *name, const char *args)
 {
        struct rte_vdev_device *dev;
-       struct rte_devargs *devargs;
        int ret;
 
        rte_spinlock_recursive_lock(&vdev_device_list_lock);
@@ -259,9 +258,8 @@ rte_vdev_init(const char *name, const char *args)
                        if (ret > 0)
                                VDEV_LOG(ERR, "no driver found for %s", name);
                        /* If fails, remove it from vdev list */
-                       devargs = dev->device.devargs;
                        TAILQ_REMOVE(&vdev_device_list, dev, next);
-                       rte_devargs_remove(devargs->bus->name, devargs->name);
+                       rte_devargs_remove(dev->device.devargs);
                        free(dev);
                }
        }
@@ -289,7 +287,6 @@ int
 rte_vdev_uninit(const char *name)
 {
        struct rte_vdev_device *dev;
-       struct rte_devargs *devargs;
        int ret;
 
        if (name == NULL)
@@ -308,8 +305,7 @@ rte_vdev_uninit(const char *name)
                goto unlock;
 
        TAILQ_REMOVE(&vdev_device_list, dev, next);
-       devargs = dev->device.devargs;
-       rte_devargs_remove(devargs->bus->name, devargs->name);
+       rte_devargs_remove(dev->device.devargs);
        free(dev);
 
 unlock:
@@ -459,6 +455,7 @@ vdev_scan(void)
                        continue;
                }
 
+               dev->device.bus = &rte_vdev_bus;
                dev->device.devargs = devargs;
                dev->device.numa_node = SOCKET_ID_ANY;
                dev->device.name = devargs->name;
@@ -484,7 +481,7 @@ vdev_probe(void)
                 * we call each driver probe.
                 */
 
-               if (dev->device.driver)
+               if (rte_dev_is_probed(&dev->device))
                        continue;
 
                if (vdev_probe_all_drivers(dev)) {
@@ -497,9 +494,9 @@ vdev_probe(void)
        return ret;
 }
 
-static struct rte_device *
-vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
-                const void *data)
+struct rte_device *
+rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+                    const void *data)
 {
        const struct rte_vdev_device *vstart;
        struct rte_vdev_device *dev;
@@ -536,10 +533,11 @@ vdev_unplug(struct rte_device *dev)
 static struct rte_bus rte_vdev_bus = {
        .scan = vdev_scan,
        .probe = vdev_probe,
-       .find_device = vdev_find_device,
+       .find_device = rte_vdev_find_device,
        .plug = vdev_plug,
        .unplug = vdev_unplug,
        .parse = vdev_parse,
+       .dev_iterate = rte_vdev_dev_iterate,
 };
 
 RTE_REGISTER_BUS(vdev, rte_vdev_bus);