net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_eal / common / eal_common_memzone.c

diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c
index 5d28341..ea072a2 100644 (file)
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -144,16 +144,16 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
                return NULL;
        }
 
-       /* zone already exist */
-       if ((memzone_lookup_thread_unsafe(name)) != NULL) {
-               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s> already exists\n",
+       if (strlen(name) > sizeof(mz->name) - 1) {
+               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n",
                        __func__, name);
-               rte_errno = EEXIST;
+               rte_errno = ENAMETOOLONG;
                return NULL;
        }
 
-       if (strlen(name) >= sizeof(mz->name) - 1) {
-               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n",
+       /* zone already exist */
+       if ((memzone_lookup_thread_unsafe(name)) != NULL) {
+               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s> already exists\n",
                        __func__, name);
                rte_errno = EEXIST;
                return NULL;
@@ -189,7 +189,8 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
                return NULL;
        }
 
-       if ((socket_id != SOCKET_ID_ANY) && (socket_id >= RTE_MAX_NUMA_NODES)) {
+       if ((socket_id != SOCKET_ID_ANY) &&
+           (socket_id >= RTE_MAX_NUMA_NODES || socket_id < 0)) {
                rte_errno = EINVAL;
                return NULL;
        }
@@ -250,7 +251,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
 
        mcfg->memzone_cnt++;
        snprintf(mz->name, sizeof(mz->name), "%s", name);
-       mz->phys_addr = rte_malloc_virt2phy(mz_addr);
+       mz->iova = rte_malloc_virt2iova(mz_addr);
        mz->addr = mz_addr;
        mz->len = (requested_len == 0 ? elem->size : requested_len);
        mz->hugepage_sz = elem->ms->hugepage_sz;
@@ -337,19 +338,7 @@ rte_memzone_free(const struct rte_memzone *mz)
        idx = ((uintptr_t)mz - (uintptr_t)mcfg->memzone);
        idx = idx / sizeof(struct rte_memzone);
 
-#ifdef RTE_LIBRTE_IVSHMEM
-       /*
-        * If ioremap_addr is set, it's an IVSHMEM memzone and we cannot
-        * free it.
-        */
-       if (mcfg->memzone[idx].ioremap_addr != 0) {
-               rte_rwlock_write_unlock(&mcfg->mlock);
-               return -EINVAL;
-       }
-#endif
-
        addr = mcfg->memzone[idx].addr;
-
        if (addr == NULL)
                ret = -EINVAL;
        else if (mcfg->memzone_cnt == 0) {
@@ -402,10 +391,10 @@ rte_memzone_dump(FILE *f)
        for (i=0; i<RTE_MAX_MEMZONE; i++) {
                if (mcfg->memzone[i].addr == NULL)
                        break;
-               fprintf(f, "Zone %u: name:<%s>, phys:0x%"PRIx64", len:0x%zx"
+               fprintf(f, "Zone %u: name:<%s>, IO:0x%"PRIx64", len:0x%zx"
                       ", virt:%p, socket_id:%"PRId32", flags:%"PRIx32"\n", i,
                       mcfg->memzone[i].name,
-                      mcfg->memzone[i].phys_addr,
+                      mcfg->memzone[i].iova,
                       mcfg->memzone[i].len,
                       mcfg->memzone[i].addr,
                       mcfg->memzone[i].socket_id,