Checking internal API has little sense as users are not supposed to call those. Use public API to achieve similar coverage.
Signed-off-by: David Marchand <[email protected]> --- app/test/test_vdev.c | 85 ++++++++------------------------------------ 1 file changed, 15 insertions(+), 70 deletions(-) diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c index c300976ace..6951ef7cc3 100644 --- a/app/test/test_vdev.c +++ b/app/test/test_vdev.c @@ -2,69 +2,26 @@ * Copyright 2021 6WIND S.A. */ -#include <stdlib.h> #include <stdio.h> #include <string.h> -#include <rte_common.h> #include <rte_dev.h> -#include <rte_kvargs.h> -#include <bus_driver.h> +#include <rte_bus.h> #include <rte_bus_vdev.h> #include "test.h" -#define TEST_VDEV_KEY_NAME "name" - -static const char * const valid_keys[] = { - TEST_VDEV_KEY_NAME, - NULL, -}; - -static int -cmp_dev_name(const struct rte_device *dev, const void *name) -{ - return strcmp(rte_dev_name(dev), name); -} - -static int -cmp_dev_match(const struct rte_device *dev, const void *_kvlist) -{ - const struct rte_kvargs *kvlist = _kvlist; - const char *key = TEST_VDEV_KEY_NAME; - const char *name; - - /* no kvlist arg, all devices match */ - if (kvlist == NULL) - return 0; - - /* if key is present in kvlist and does not match, filter device */ - name = rte_kvargs_get(kvlist, key); - if (name != NULL && strcmp(name, rte_dev_name(dev)) != 0) - return -1; - - return 0; -} - static struct rte_device * -get_matching_vdev(const char *match_str) +find_vdev_by_name(const char *name) { - struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); - struct rte_kvargs *kvargs = NULL; + struct rte_dev_iterator it = { 0 }; struct rte_device *dev; - if (match_str != NULL) { - kvargs = rte_kvargs_parse(match_str, valid_keys); - if (kvargs == NULL) { - printf("Failed to parse match string\n"); - return NULL; - } + RTE_DEV_FOREACH(dev, "bus=vdev", &it) { + if (strcmp(rte_dev_name(dev), name) == 0) + return dev; } - - dev = vdev_bus->find_device(vdev_bus, NULL, cmp_dev_match, kvargs); - rte_kvargs_free(kvargs); - - return dev; + return NULL; } static int @@ -83,7 +40,7 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test0\n"); goto fail; } - dev0 = vdev_bus->find_device(vdev_bus, NULL, cmp_dev_name, "net_null_test0"); + dev0 = find_vdev_by_name("net_null_test0"); if (dev0 == NULL) { printf("Cannot find net_null_test0 vdev\n"); goto fail; @@ -94,44 +51,32 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test1\n"); goto fail; } - dev1 = vdev_bus->find_device(vdev_bus, NULL, cmp_dev_name, "net_null_test1"); + dev1 = find_vdev_by_name("net_null_test1"); if (dev1 == NULL) { printf("Cannot find net_null_test1 vdev\n"); goto fail; } - /* try to match vdevs */ - dev = get_matching_vdev("name=net_null_test0"); + /* try to find vdevs */ + dev = find_vdev_by_name("net_null_test0"); if (dev != dev0) { printf("Cannot match net_null_test0 vdev\n"); goto fail; } - dev = get_matching_vdev("name=net_null_test1"); + dev = find_vdev_by_name("net_null_test1"); if (dev != dev1) { printf("Cannot match net_null_test1 vdev\n"); goto fail; } - dev = get_matching_vdev("name=unexistant"); + dev = find_vdev_by_name("nonexistent"); if (dev != NULL) { - printf("Unexistant vdev should not match\n"); - goto fail; - } - - dev = get_matching_vdev(""); - if (dev == NULL || dev == dev1) { - printf("Cannot match any vdev with empty match string\n"); - goto fail; - } - - dev = get_matching_vdev(NULL); - if (dev == NULL || dev == dev1) { - printf("Cannot match any vdev with NULL match string\n"); + printf("Nonexistent vdev should not match\n"); goto fail; } - /* iterate all vdevs, and ensure we find vdev0 and vdev1 */ + /* iterate all vdevs, and ensure we find dev0 and dev1 */ RTE_DEV_FOREACH(dev, "bus=vdev", &dev_iter) { if (dev == dev0) dev0 = NULL; -- 2.54.0
