net/virtio: fix incorrect cast of void *

[dpdk.git] / test / test / test_table_tables.c

diff --git a/test/test/test_table_tables.c b/test/test/test_table_tables.c
index 7f85587..a1b0c58 100644 (file)
--- a/test/test/test_table_tables.c
+++ b/test/test/test_table_tables.c
@@ -60,7 +60,7 @@ table_test table_tests[] = {
        memset(key, 0, 32);                                             \
        k32 = (uint32_t *) key;                                         \
        k32[0] = (value);                                               \
-       *signature = pipeline_test_hash(key, 0, 0);                     \
+       *signature = pipeline_test_hash(key, NULL, 0, 0);                       \
 } while (0)
 
 unsigned n_table_tests = RTE_DIM(table_tests);
@@ -674,7 +674,7 @@ test_table_hash_lru_generic(struct rte_table_ops *ops, uint32_t key_size)
                .key_mask = NULL,
                .n_keys = 1 << 10,
                .n_buckets = 1 << 10,
-               .f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+               .f_hash = pipeline_test_hash,
                .seed = 0,
        };
 
@@ -691,7 +691,7 @@ test_table_hash_lru_generic(struct rte_table_ops *ops, uint32_t key_size)
        if (table != NULL)
                return -4;
 
-       hash_params.f_hash = (rte_table_hash_op_hash)pipeline_test_hash;
+       hash_params.f_hash = pipeline_test_hash;
 
        table = ops->f_create(&hash_params, 0, 1);
        if (table == NULL)
@@ -777,7 +777,7 @@ test_table_hash_ext_generic(struct rte_table_ops *ops, uint32_t key_size)
                .key_mask = NULL,
                .n_keys = 1 << 10,
                .n_buckets = 1 << 10,
-               .f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+               .f_hash = pipeline_test_hash,
                .seed = 0,
        };
 
@@ -801,7 +801,7 @@ test_table_hash_ext_generic(struct rte_table_ops *ops, uint32_t key_size)
        if (table != NULL)
                return -4;
 
-       hash_params.f_hash = (rte_table_hash_op_hash)pipeline_test_hash;
+       hash_params.f_hash = pipeline_test_hash;
 
        table = ops->f_create(&hash_params, 0, 1);
        if (table == NULL)
@@ -878,6 +878,18 @@ test_table_hash_lru(void)
        if (status < 0)
                return status;
 
+       status = test_table_hash_lru_generic(
+               &rte_table_hash_key16_lru_ops,
+               16);
+       if (status < 0)
+               return status;
+
+       status = test_table_hash_lru_generic(
+               &rte_table_hash_key32_lru_ops,
+               32);
+       if (status < 0)
+               return status;
+
        status = test_lru_update();
        if (status < 0)
                return status;
@@ -894,6 +906,14 @@ test_table_hash_ext(void)
        if (status < 0)
                return status;
 
+       status = test_table_hash_ext_generic(&rte_table_hash_key16_ext_ops, 16);
+       if (status < 0)
+               return status;
+
+       status = test_table_hash_ext_generic(&rte_table_hash_key32_ext_ops, 32);
+       if (status < 0)
+               return status;
+
        return 0;
 }
 
@@ -912,14 +932,15 @@ test_table_hash_cuckoo(void)
        uint32_t entry_size = 1;
 
        /* Initialize params and create tables */
-       struct rte_table_hash_cuckoo_params cuckoo_params = {
+       struct rte_table_hash_params cuckoo_params = {
+               .name = "TABLE",
                .key_size = 32,
-               .n_keys = 1 << 24,
-               .f_hash = pipeline_test_hash,
-               .seed = 0,
-               .signature_offset = APP_METADATA_OFFSET(0),
                .key_offset = APP_METADATA_OFFSET(32),
-               .name = "CUCKOO",
+               .key_mask = NULL,
+               .n_keys = 1 << 16,
+               .n_buckets = 1 << 16,
+               .f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+               .seed = 0, 
        };
 
        table = rte_table_hash_cuckoo_ops.f_create(NULL, 0, entry_size);