devargs: make device representation generic

[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 2250b8f..7b857a6 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -177,12 +177,12 @@ alloc_devargs(const char *name, const char *args)
                return NULL;
 
        devargs->type = RTE_DEVTYPE_VIRTUAL;
+       devargs->bus = rte_bus_find_by_name("vdev");
        if (args)
                devargs->args = strdup(args);
 
-       ret = snprintf(devargs->virt.drv_name,
-                              sizeof(devargs->virt.drv_name), "%s", name);
-       if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name)) {
+       ret = snprintf(devargs->name, sizeof(devargs->name), "%s", name);
+       if (ret < 0 || ret >= (int)sizeof(devargs->name)) {
                free(devargs->args);
                free(devargs);
                return NULL;
@@ -217,7 +217,7 @@ rte_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;
+       dev->device.name = devargs->name;
 
        ret = vdev_probe_all_drivers(dev);
        if (ret) {
@@ -289,15 +289,16 @@ vdev_scan(void)
 {
        struct rte_vdev_device *dev;
        struct rte_devargs *devargs;
+       struct rte_bus *vbus;
 
        /* for virtual devices we scan the devargs_list populated via cmdline */
-
+       vbus = rte_bus_find_by_name("vdev");
        TAILQ_FOREACH(devargs, &devargs_list, next) {
 
-               if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+               if (devargs->bus != vbus)
                        continue;
 
-               dev = find_vdev(devargs->virt.drv_name);
+               dev = find_vdev(devargs->name);
                if (dev)
                        continue;
 
@@ -307,7 +308,7 @@ vdev_scan(void)
 
                dev->device.devargs = devargs;
                dev->device.numa_node = SOCKET_ID_ANY;
-               dev->device.name = devargs->virt.drv_name;
+               dev->device.name = devargs->name;
 
                TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
        }