tile: fix build

[dpdk.git] / app / test / test_devargs.c

diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
index 035ed59..63242f1 100644 (file)
--- a/app/test/test_devargs.c
+++ b/app/test/test_devargs.c
@@ -48,11 +48,12 @@ static void free_devargs_list(void)
        while (!TAILQ_EMPTY(&devargs_list)) {
                devargs = TAILQ_FIRST(&devargs_list);
                TAILQ_REMOVE(&devargs_list, devargs, next);
+               free(devargs->args);
                free(devargs);
        }
 }
 
-int
+static int
 test_devargs(void)
 {
        struct rte_devargs_list save_devargs_list;
@@ -67,7 +68,7 @@ test_devargs(void)
                goto fail;
        if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "0000:5:00.0") < 0)
                goto fail;
-       if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, "04:00.0;arg=val") < 0)
+       if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, "04:00.0,arg=val") < 0)
                goto fail;
        if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, "0000:01:00.1") < 0)
                goto fail;
@@ -77,22 +78,22 @@ test_devargs(void)
                goto fail;
        if (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 0)
                goto fail;
-       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring0") < 0)
+       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring0") < 0)
                goto fail;
-       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring1;key=val;k2=val2") < 0)
+       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring1,key=val,k2=val2") < 0)
                goto fail;
        if (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 2)
                goto fail;
        free_devargs_list();
 
        /* check virtual device with argument parsing */
-       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring1;k1=val;k2=val2") < 0)
+       if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring1,k1=val,k2=val2") < 0)
                goto fail;
        devargs = TAILQ_FIRST(&devargs_list);
-       if (strncmp(devargs->virtual.drv_name, "eth_ring1",
-                       sizeof(devargs->virtual.drv_name) != 0))
+       if (strncmp(devargs->virt.drv_name, "net_ring1",
+                       sizeof(devargs->virt.drv_name)) != 0)
                goto fail;
-       if (strncmp(devargs->args, "k1=val;k2=val2", sizeof(devargs->args) != 0))
+       if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0)
                goto fail;
        free_devargs_list();
 
@@ -105,7 +106,7 @@ test_devargs(void)
                devargs->pci.addr.devid != 0 ||
                devargs->pci.addr.function != 1)
                goto fail;
-       if (strncmp(devargs->args, "", sizeof(devargs->args) != 0))
+       if (!devargs->args || strcmp(devargs->args, "") != 0)
                goto fail;
        free_devargs_list();
 
@@ -116,7 +117,7 @@ test_devargs(void)
                goto fail;
        if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "foo") == 0)
                goto fail;
-       if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, ";") == 0)
+       if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, ",") == 0)
                goto fail;
        if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "000f:0:0") == 0)
                goto fail;
@@ -129,3 +130,5 @@ test_devargs(void)
        devargs_list = save_devargs_list;
        return -1;
 }
+
+REGISTER_TEST_COMMAND(devargs_autotest, test_devargs);