diff options
Diffstat (limited to 'vnet/vnet/devices')
-rw-r--r-- | vnet/vnet/devices/dpdk/vhost_user.c | 4 | ||||
-rw-r--r-- | vnet/vnet/devices/ssvm/node.c | 8 | ||||
-rw-r--r-- | vnet/vnet/devices/ssvm/ssvm_eth.c | 10 | ||||
-rw-r--r-- | vnet/vnet/devices/ssvm/ssvm_eth.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/vnet/vnet/devices/dpdk/vhost_user.c b/vnet/vnet/devices/dpdk/vhost_user.c index 9db4a0ac..9cdf664c 100644 --- a/vnet/vnet/devices/dpdk/vhost_user.c +++ b/vnet/vnet/devices/dpdk/vhost_user.c @@ -495,9 +495,9 @@ dpdk_vhost_user_set_mem_table(u32 hw_if_index, vhost_user_memory_t * vum, int fd mem->regions[i].userspace_address = vum->regions[i].userspace_addr; mapped_size = mem->regions[i].memory_size + vum->regions[i].mmap_offset; - mapped_address = (uint64_t)(uintptr_t)mmap(NULL, mapped_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd[i], 0); + mapped_address = pointer_to_uword(mmap(NULL, mapped_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd[i], 0)); - if ((void *)mapped_address == MAP_FAILED) + if (uword_to_pointer(mapped_address, void*) == MAP_FAILED) { clib_warning("mmap error"); return 0; diff --git a/vnet/vnet/devices/ssvm/node.c b/vnet/vnet/devices/ssvm/node.c index b26d73d1..3a5709d0 100644 --- a/vnet/vnet/devices/ssvm/node.c +++ b/vnet/vnet/devices/ssvm/node.c @@ -97,8 +97,8 @@ ssvm_eth_device_input (ssvm_eth_main_t * em, uword n_trace = vlib_get_trace_count (vm, node); /* Either side down? buh-bye... */ - if ((u64)(sh->opaque [MASTER_ADMIN_STATE_INDEX]) == 0 || - (u64)(sh->opaque [SLAVE_ADMIN_STATE_INDEX]) == 0) + if (pointer_to_uword(sh->opaque [MASTER_ADMIN_STATE_INDEX]) == 0 || + pointer_to_uword(sh->opaque [SLAVE_ADMIN_STATE_INDEX]) == 0) return 0; if (intfc->i_am_master) @@ -271,14 +271,14 @@ ssvm_eth_device_input (ssvm_eth_main_t * em, ASSERT(vec_len(intfc->rx_queue) > 0); - n_available = (u32)(u64)(sh->opaque[CHUNK_POOL_NFREE]); + n_available = (u32)pointer_to_uword(sh->opaque[CHUNK_POOL_NFREE]); elt_indices = (u32 *)(sh->opaque[CHUNK_POOL_FREELIST_INDEX]); memcpy (&elt_indices[n_available], intfc->rx_queue, vec_len (intfc->rx_queue) * sizeof (u32)); n_available += vec_len (intfc->rx_queue); - sh->opaque[CHUNK_POOL_NFREE] = (void *) (u64) n_available; + sh->opaque[CHUNK_POOL_NFREE] = uword_to_pointer(n_available, void* ); ssvm_unlock (sh); diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.c b/vnet/vnet/devices/ssvm/ssvm_eth.c index 7d937f07..23ec0261 100644 --- a/vnet/vnet/devices/ssvm/ssvm_eth.c +++ b/vnet/vnet/devices/ssvm/ssvm_eth.c @@ -95,7 +95,7 @@ int ssvm_eth_create (ssvm_eth_main_t * em, u8 * name, int is_master) sh->opaque [CHUNK_POOL_INDEX] = (void *) elts; sh->opaque [CHUNK_POOL_FREELIST_INDEX] = (void *) elt_indices; - sh->opaque [CHUNK_POOL_NFREE] = (void *) em->nbuffers; + sh->opaque [CHUNK_POOL_NFREE] = (void *)(uword) em->nbuffers; ssvm_pop_heap (oldheap); @@ -276,8 +276,8 @@ ssvm_eth_interface_tx (vlib_main_t * vm, n_present_in_cache = vec_len (em->chunk_cache); /* admin / link up/down check */ - if ((u64)(sh->opaque [MASTER_ADMIN_STATE_INDEX]) == 0 || - (u64)(sh->opaque [SLAVE_ADMIN_STATE_INDEX]) == 0) + if (sh->opaque [MASTER_ADMIN_STATE_INDEX] == 0 || + sh->opaque [SLAVE_ADMIN_STATE_INDEX] == 0) { interface_down = 1; goto out; @@ -287,7 +287,7 @@ ssvm_eth_interface_tx (vlib_main_t * vm, elts = (ssvm_eth_queue_elt_t *) (sh->opaque [CHUNK_POOL_INDEX]); elt_indices = (u32 *) (sh->opaque [CHUNK_POOL_FREELIST_INDEX]); - n_available = (u32) (u64) (sh->opaque [CHUNK_POOL_NFREE]); + n_available = (u32) pointer_to_uword(sh->opaque [CHUNK_POOL_NFREE]); if (n_present_in_cache < n_left*2) { @@ -305,7 +305,7 @@ ssvm_eth_interface_tx (vlib_main_t * vm, n_present_in_cache += n_allocated; n_available -= n_allocated; - sh->opaque [CHUNK_POOL_NFREE] = (void *) (u64) n_available; + sh->opaque [CHUNK_POOL_NFREE] = uword_to_pointer(n_available, void*); _vec_len (em->chunk_cache) = n_present_in_cache; } diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.h b/vnet/vnet/devices/ssvm/ssvm_eth.h index 8f1f8896..23af7ed5 100644 --- a/vnet/vnet/devices/ssvm/ssvm_eth.h +++ b/vnet/vnet/devices/ssvm/ssvm_eth.h @@ -114,7 +114,7 @@ static inline void ssvm_eth_validate_freelists (int need_lock) ssvm_lock (sh, my_pid, 15); elt_indices = (u32 *) (sh->opaque [CHUNK_POOL_FREELIST_INDEX]); - n_available = (u32) (u64) (sh->opaque [CHUNK_POOL_NFREE]); + n_available = (u32) (uword) (sh->opaque [CHUNK_POOL_NFREE]); for (i = 0; i < n_available; i++) ASSERT (elt_indices[i] < 2048); |