examples/vhost_xen: remove

[dpdk.git] / drivers / net / xenvirt / rte_mempool_gntalloc.c

diff --git a/drivers/net/xenvirt/rte_mempool_gntalloc.c b/drivers/net/xenvirt/rte_mempool_gntalloc.c
index 0585f08..7f7aecd 100644 (file)
--- a/drivers/net/xenvirt/rte_mempool_gntalloc.c
+++ b/drivers/net/xenvirt/rte_mempool_gntalloc.c
@@ -78,8 +78,8 @@ static struct _mempool_gntalloc_info
 _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
                   unsigned cache_size, unsigned private_data_size,
                   rte_mempool_ctor_t *mp_init, void *mp_init_arg,
-                  rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
-                  int socket_id, unsigned flags)
+                  rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
+                  int socket_id, unsigned int flags)
 {
        struct _mempool_gntalloc_info mgi;
        struct rte_mempool *mp = NULL;
@@ -114,7 +114,7 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
        pg_shift = rte_bsf32(pg_sz);
 
        rte_mempool_calc_obj_size(elt_size, flags, &objsz);
-       sz = rte_mempool_xmem_size(elt_num, objsz.total_size, pg_shift);
+       sz = rte_mempool_xmem_size(elt_num, objsz.total_size, pg_shift, flags);
        pg_num = sz >> pg_shift;
 
        pa_arr = calloc(pg_num, sizeof(pa_arr[0]));
@@ -162,7 +162,8 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
         * Check that allocated size is big enough to hold elt_num
         * objects and a calcualte how many bytes are actually required.
         */
-       usz = rte_mempool_xmem_usage(va, elt_num, objsz.total_size, pa_arr, pg_num, pg_shift);
+       usz = rte_mempool_xmem_usage(va, elt_num, objsz.total_size, pa_arr,
+                                    pg_num, pg_shift, flags);
        if (usz < 0) {
                mp = NULL;
                i = pg_num;
@@ -202,7 +203,7 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
                                obj_init, obj_init_arg,
                                socket_id, flags, va, pa_arr, rpg_num, pg_shift);
 
-               RTE_VERIFY(elt_num == mp->size);
+               RTE_ASSERT(elt_num == mp->size);
        }
        mgi.mp = mp;
        mgi.pg_num = rpg_num;
@@ -229,15 +230,12 @@ mmap_failed:
                        munmap(gnt_arr[i].va, pg_sz);
        }
 out:
-       if (gnt_arr)
-               free(gnt_arr);
+       free(gnt_arr);
        if (orig_va)
                munmap(orig_va, sz);
        if (mp == NULL) {
-               if (gref_arr)
-                       free(gref_arr);
-               if (pa_arr)
-                       free(pa_arr);
+               free(gref_arr);
+               free(pa_arr);
 
                /* some gref has already been de-allocated from the list in the driver,
                 * so dealloc one by one, and it is safe to deallocate twice
@@ -256,7 +254,7 @@ struct rte_mempool *
 rte_mempool_gntalloc_create(const char *name, unsigned elt_num, unsigned elt_size,
                   unsigned cache_size, unsigned private_data_size,
                   rte_mempool_ctor_t *mp_init, void *mp_init_arg,
-                  rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
+                  rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
                   int socket_id, unsigned flags)
 {
        int rv;