mem: rename segment address from physical to IOVA

[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..f7e547a 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -47,6 +47,9 @@
 #include <rte_memory.h>
 #include <rte_errno.h>
 
+/* Forward declare to access virtual bus name */
+static struct rte_bus rte_vdev_bus;
+
 /** Double linked list of virtual device drivers. */
 TAILQ_HEAD(vdev_device_list, rte_vdev_device);
 
@@ -69,38 +72,6 @@ rte_vdev_unregister(struct rte_vdev_driver *driver)
        TAILQ_REMOVE(&vdev_driver_list, driver, next);
 }
 
-/*
- * Parse "driver" devargs without adding a dependency on rte_kvargs.h
- */
-static char *parse_driver_arg(const char *args)
-{
-       const char *c;
-       char *str;
-
-       if (!args || args[0] == '\0')
-               return NULL;
-
-       c = args;
-
-       do {
-               if (strncmp(c, "driver=", 7) == 0) {
-                       c += 7;
-                       break;
-               }
-
-               c = strchr(c, ',');
-               if (c)
-                       c++;
-       } while (c);
-
-       if (c)
-               str = strdup(c);
-       else
-               str = NULL;
-
-       return str;
-}
-
 static int
 vdev_parse(const char *name, void *addr)
 {
@@ -126,26 +97,20 @@ static int
 vdev_probe_all_drivers(struct rte_vdev_device *dev)
 {
        const char *name;
-       char *drv_name;
        struct rte_vdev_driver *driver;
-       int ret = 1;
+       int ret;
 
-       drv_name = parse_driver_arg(rte_vdev_device_args(dev));
-       name = drv_name ? drv_name : rte_vdev_device_name(dev);
+       name = rte_vdev_device_name(dev);
 
        RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
                rte_vdev_device_name(dev));
 
-       if (vdev_parse(name, &driver)) {
-               ret = -1;
-               goto out;
-       }
+       if (vdev_parse(name, &driver))
+               return -1;
        dev->device.driver = &driver->driver;
        ret = driver->probe(dev);
        if (ret)
                dev->device.driver = NULL;
-out:
-       free(drv_name);
        return ret;
 }
 
@@ -176,13 +141,14 @@ alloc_devargs(const char *name, const char *args)
        if (!devargs)
                return NULL;
 
-       devargs->type = RTE_DEVTYPE_VIRTUAL;
+       devargs->bus = &rte_vdev_bus;
        if (args)
                devargs->args = strdup(args);
+       else
+               devargs->args = strdup("");
 
-       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 +183,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) {
@@ -291,13 +257,12 @@ vdev_scan(void)
        struct rte_devargs *devargs;
 
        /* for virtual devices we scan the devargs_list populated via cmdline */
-
        TAILQ_FOREACH(devargs, &devargs_list, next) {
 
-               if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+               if (devargs->bus != &rte_vdev_bus)
                        continue;
 
-               dev = find_vdev(devargs->virt.drv_name);
+               dev = find_vdev(devargs->name);
                if (dev)
                        continue;
 
@@ -307,7 +272,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);
        }
@@ -353,13 +318,15 @@ vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
        return NULL;
 }
 
+static int
+vdev_plug(struct rte_device *dev)
+{
+       return vdev_probe_all_drivers(RTE_DEV_TO_VDEV(dev));
+}
+
 static int
 vdev_unplug(struct rte_device *dev)
 {
-       /*
-        * The virtual bus doesn't support 'unattached' devices so this is
-        * actually equal to hotplugging removal of it.
-        */
        return rte_vdev_uninit(dev->name);
 }
 
@@ -367,7 +334,7 @@ static struct rte_bus rte_vdev_bus = {
        .scan = vdev_scan,
        .probe = vdev_probe,
        .find_device = vdev_find_device,
-       /* .plug = NULL, see comment on vdev_unplug */
+       .plug = vdev_plug,
        .unplug = vdev_unplug,
        .parse = vdev_parse,
 };