[dpdk-dev] [PATCH v2 4/9] vdev: implement parse bus operation
Gaetan Rivet
gaetan.rivet at 6wind.com
Wed May 24 18:15:47 CEST 2017
Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
lib/librte_eal/common/eal_common_vdev.c | 62 ++++++++++++++++++---------------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 2095b01..9c9a1de 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -102,6 +102,31 @@ static char *parse_driver_arg(const char *args)
return str;
}
+/*
+ * typeof(addr): (struct rte_vdev_driver **)
+ */
+static int
+vdev_parse(const char *name, void *addr)
+{
+ struct rte_vdev_driver **out = addr;
+ struct rte_vdev_driver *driver;
+
+ TAILQ_FOREACH(driver, &vdev_driver_list, next) {
+ if (!strncmp(driver->driver.name, name,
+ strlen(driver->driver.name)))
+ goto ret;
+ if (driver->driver.alias &&
+ !strncmp(driver->driver.alias, name,
+ strlen(driver->driver.alias)))
+ goto ret;
+ }
+ driver = NULL;
+ret:
+ if (addr != NULL)
+ *out = driver;
+ return !driver;
+}
+
static int
vdev_probe_all_drivers(struct rte_vdev_device *dev)
{
@@ -116,36 +141,14 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
rte_vdev_device_name(dev));
- TAILQ_FOREACH(driver, &vdev_driver_list, next) {
- /*
- * search a driver prefix in virtual device name.
- * For example, if the driver is pcap PMD, driver->name
- * will be "net_pcap", but "name" will be "net_pcapN".
- * So use strncmp to compare.
- */
- if (!strncmp(driver->driver.name, name,
- strlen(driver->driver.name))) {
- dev->device.driver = &driver->driver;
- ret = driver->probe(dev);
- if (ret)
- dev->device.driver = NULL;
- goto out;
- }
- }
-
- /* Give new names precedence over aliases. */
- TAILQ_FOREACH(driver, &vdev_driver_list, next) {
- if (driver->driver.alias &&
- !strncmp(driver->driver.alias, name,
- strlen(driver->driver.alias))) {
- dev->device.driver = &driver->driver;
- ret = driver->probe(dev);
- if (ret)
- dev->device.driver = NULL;
- break;
- }
+ if (vdev_parse(name, &driver)) {
+ ret = -1;
+ goto out;
}
-
+ dev->device.driver = &driver->driver;
+ ret = driver->probe(dev);
+ if (ret)
+ dev->device.driver = NULL;
out:
free(drv_name);
return ret;
@@ -368,6 +371,7 @@ static struct rte_bus rte_vdev_bus = {
.find_device = vdev_find_device,
/* .attach = NULL, see comment on vdev_detach */
.detach = vdev_detach,
+ .parse = vdev_parse,
};
RTE_INIT(rte_vdev_bus_register);
--
2.1.4
More information about the dev
mailing list