[PATCH 2/3] vdev: implement attach bus operation

[Gaetan Rivet <gaetan.rivet@6wind.com>]

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
 lib/librte_eal/common/eal_common_dev.c  | 53 +++++++++++++++++++--------------
 lib/librte_eal/common/eal_common_vdev.c |  8 ++++-
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 829d7f3..fdd06be 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -61,6 +61,9 @@ static int cmp_detached_dev_name(const struct rte_device *dev,
 int rte_eal_dev_attach(const char *name, const char *devargs)
 {
 	struct rte_device *dev;
+	struct rte_device device;
+	struct rte_devargs da;
+	struct rte_bus *bus;
 	int ret;
 
 	if (name == NULL || devargs == NULL) {
@@ -69,31 +72,35 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
 	}
 
 	dev = rte_bus_find_device(NULL, cmp_detached_dev_name, name);
-	if (dev) {
-		struct rte_bus *bus;
-
+	if (dev)
 		bus = rte_bus_find_by_device(dev);
-		if (!bus) {
-			RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
-				name);
-			return -EINVAL;
-		}
-
-		if (!bus->attach) {
-			RTE_LOG(ERR, EAL, "Bus function not supported\n");
-			return -ENOTSUP;
-		}
-
-		ret = bus->attach(dev);
-		goto out;
+	else
+		bus = rte_bus_from_dev(name);
+	if (!bus) {
+		RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
+			name);
+		return -EINVAL;
 	}
-
-	/*
-	 * If we haven't found a bus device the user meant to "hotplug" a
-	 * virtual device instead.
-	 */
-	ret = rte_vdev_init(name, devargs);
-out:
+	if (!bus->attach) {
+		RTE_LOG(ERR, EAL, "Bus function not supported\n");
+		return -ENOTSUP;
+	}
+	if (!dev) {
+		char da_str[snprintf(NULL, 0, "%s,%s", name, devargs) + 1];
+
+		/*
+		 * If we haven't found a bus device the user meant to "hotplug"
+		 * a device instead.
+		 */
+		dev = &device;
+		snprintf(da_str, sizeof(da_str), "%s,%s", name, devargs);
+		ret = rte_eal_devargs_parse(da_str, &da);
+		if (ret)
+			return ret;
+		dev->name = da.name;
+		dev->devargs = &da;
+	}
+	ret = bus->attach(dev);
 	if (ret)
 		RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
 			name);
diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index fc5e2d2..4e83326 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -356,6 +356,12 @@ vdev_find_device(int (*match)(const struct rte_device *dev, const void *data),
 }
 
 static int
+vdev_attach(struct rte_device *dev)
+{
+	return rte_vdev_init(dev->devargs->name, dev->devargs->args);
+}
+
+static int
 vdev_detach(struct rte_device *dev)
 {
 	/*
@@ -369,7 +375,7 @@ static struct rte_bus rte_vdev_bus = {
 	.scan = vdev_scan,
 	.probe = vdev_probe,
 	.find_device = vdev_find_device,
-	/* .attach = NULL, see comment on vdev_detach */
+	.attach = vdev_attach,
 	.detach = vdev_detach,
 	.parse = vdev_parse,
 };
-- 
2.1.4