net/virtio: fix incorrect cast of void *

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

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 78b6fc0..dda8f58 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -66,26 +66,26 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name)
 
 int rte_eal_dev_attach(const char *name, const char *devargs)
 {
-       int ret;
+       struct rte_bus *bus;
 
        if (name == NULL || devargs == NULL) {
                RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
                return -EINVAL;
        }
 
-       ret = rte_eal_hotplug_add("pci", name, devargs);
-       if (ret && ret != -EINVAL)
-               return ret;
-
-       /*
-        * If we haven't found a bus device the user meant to "hotplug" a
-        * virtual device instead.
-        */
-       ret = rte_vdev_init(name, devargs);
-       if (ret)
-               RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
+       bus = rte_bus_find_by_device_name(name);
+       if (bus == NULL) {
+               RTE_LOG(ERR, EAL, "Unable to find a bus for the device '%s'\n",
                        name);
-       return ret;
+               return -EINVAL;
+       }
+       if (strcmp(bus->name, "pci") == 0 || strcmp(bus->name, "vdev") == 0)
+               return rte_eal_hotplug_add(bus->name, name, devargs);
+
+       RTE_LOG(ERR, EAL,
+               "Device attach is only supported for PCI and vdev devices.\n");
+
+       return -ENOTSUP;
 }
 
 int rte_eal_dev_detach(struct rte_device *dev)
@@ -117,11 +117,29 @@ int rte_eal_dev_detach(struct rte_device *dev)
        return ret;
 }
 
+static char *
+full_dev_name(const char *bus, const char *dev, const char *args)
+{
+       char *name;
+       size_t len;
+
+       len = snprintf(NULL, 0, "%s:%s,%s", bus, dev, args) + 1;
+       name = calloc(1, len);
+       if (name == NULL) {
+               RTE_LOG(ERR, EAL, "Could not allocate full device name\n");
+               return NULL;
+       }
+       snprintf(name, len, "%s:%s,%s", bus, dev, args);
+       return name;
+}
+
 int rte_eal_hotplug_add(const char *busname, const char *devname,
                        const char *devargs)
 {
        struct rte_bus *bus;
        struct rte_device *dev;
+       struct rte_devargs *da;
+       char *name;
        int ret;
 
        bus = rte_bus_find_by_name(busname);
@@ -136,21 +154,52 @@ int rte_eal_hotplug_add(const char *busname, const char *devname,
                return -ENOTSUP;
        }
 
+       name = full_dev_name(busname, devname, devargs);
+       if (name == NULL)
+               return -ENOMEM;
+
+       da = calloc(1, sizeof(*da));
+       if (da == NULL) {
+               ret = -ENOMEM;
+               goto err_name;
+       }
+
+       ret = rte_eal_devargs_parse(name, da);
+       if (ret)
+               goto err_devarg;
+
+       ret = rte_eal_devargs_insert(da);
+       if (ret)
+               goto err_devarg;
+
        ret = bus->scan();
        if (ret)
-               return ret;
+               goto err_devarg;
 
        dev = bus->find_device(NULL, cmp_detached_dev_name, devname);
        if (dev == NULL) {
                RTE_LOG(ERR, EAL, "Cannot find unplugged device (%s)\n",
                        devname);
-               return -EINVAL;
+               ret = -ENODEV;
+               goto err_devarg;
        }
 
-       ret = bus->plug(dev, devargs);
-       if (ret)
+       ret = bus->plug(dev);
+       if (ret) {
                RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
                        dev->name);
+               goto err_devarg;
+       }
+       free(name);
+       return 0;
+
+err_devarg:
+       if (rte_eal_devargs_remove(busname, devname)) {
+               free(da->args);
+               free(da);
+       }
+err_name:
+       free(name);
        return ret;
 }
 
@@ -182,5 +231,6 @@ int rte_eal_hotplug_remove(const char *busname, const char *devname)
        if (ret)
                RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
                        dev->name);
+       rte_eal_devargs_remove(busname, devname);
        return ret;
 }