summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerruh Yigit <ferruh.yigit@intel.com>2017-05-10 12:01:04 +0100
committerThomas Monjalon <thomas@monjalon.net>2017-07-10 00:46:38 +0200
commit9bf4901d1a114f250945d73e686ef4495658464b (patch)
treec3c17334dd87a72248813be4c9748dd383bb35fb
parent701a64622c2653c0736042d2f790081db79afdc7 (diff)
downloaddpdk-9bf4901d1a114f250945d73e686ef4495658464b.zip
dpdk-9bf4901d1a114f250945d73e686ef4495658464b.tar.gz
dpdk-9bf4901d1a114f250945d73e686ef4495658464b.tar.xz
bus/vdev: remove probe with driver name option
Virtual device/driver probing done via name. A new alternative method introduced to probe the device with providing driver name in devargs as "driver=<driver_name>". This patch removes alternative method and fixes virtual device usages with proper device names. Fixes: 87c3bf29c642 ("test: do not short-circuit null device creation") Fixes: d39670086a63 ("eal: parse driver argument before probing drivers") Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
-rw-r--r--drivers/net/null/rte_eth_null.c1
-rw-r--r--lib/librte_eal/common/eal_common_vdev.c46
-rw-r--r--test/test/test_link_bonding_rssconf.c5
3 files changed, 6 insertions, 46 deletions
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 2c94339..5aef059 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -49,7 +49,6 @@ static unsigned default_packet_copy;
static const char *valid_arguments[] = {
ETH_NULL_PACKET_SIZE_ARG,
ETH_NULL_PACKET_COPY_ARG,
- "driver",
NULL
};
diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 5d81ca8..2ca0cdb 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -69,38 +69,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 +94,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;
}
diff --git a/test/test/test_link_bonding_rssconf.c b/test/test/test_link_bonding_rssconf.c
index d28db7d..dcbc9d1 100644
--- a/test/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -62,7 +62,7 @@
#define BONDED_DEV_NAME ("rssconf_bond_dev")
-#define SLAVE_DEV_NAME_FMT ("rssconf_slave%d")
+#define SLAVE_DEV_NAME_FMT ("net_null%d")
#define SLAVE_RXTX_QUEUE_FMT ("rssconf_slave%d_q%d")
#define NUM_MBUFS 8191
@@ -550,8 +550,7 @@ test_setup(void)
port_id = rte_eth_dev_count();
snprintf(name, sizeof(name), SLAVE_DEV_NAME_FMT, port_id);
- retval = rte_vdev_init(name,
- "driver=net_null,size=64,copy=0");
+ retval = rte_vdev_init(name, "size=64,copy=0");
TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
name);