diff options
| author |   Christophe Fontaine <christophe.fontaine@qosmos.com> | 2016-05-11 08:36:24 +0000 |
|---|---|---|
| committer |   Damjan Marion <damarion@cisco.com> | 2016-05-17 19:24:17 +0000 |
| commit | 95c8415531a27745c367fe2b352a4bdf2b1c7965 (patch) | |
| tree | cfdebfd11f3f065e5f90fe3414c6c5c102622da1 /vnet/vnet/devices/virtio/vhost-user.c | |
| parent | 144a90f2e1e60e9c194c61c25db406e6e5f542e9 (diff) | |
dpdk/build - 32bits compilation
In vnet/vnet/devices/dpdk/device.c, post 2 event data instead of
merging them into 1 u64.
Change-Id: I8b1d61b894279fb6eb57bb82a05affc14360e6b8
Signed-off-by: Christophe Fontaine <christophe.fontaine@qosmos.com>
Diffstat (limited to 'vnet/vnet/devices/virtio/vhost-user.c')
| -rw-r--r-- | vnet/vnet/devices/virtio/vhost-user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c index 8486135dd69..5902c42b369 100644 --- a/vnet/vnet/devices/virtio/vhost-user.c +++ b/vnet/vnet/devices/virtio/vhost-user.c @@ -140,7 +140,7 @@ static int vhost_user_name_renumber (vnet_hw_interface_t * hi, } -static inline void * map_guest_mem(vhost_user_intf_t * vui, u64 addr) +static inline void * map_guest_mem(vhost_user_intf_t * vui, uword addr) { int i; for (i=0; i<vui->nregions; i++) { @@ -153,7 +153,7 @@ static inline void * map_guest_mem(vhost_user_intf_t * vui, u64 addr) return 0; } -static inline void * map_user_mem(vhost_user_intf_t * vui, u64 addr) +static inline void * map_user_mem(vhost_user_intf_t * vui, uword addr) { int i; for (i=0; i<vui->nregions; i++) { @@ -1949,7 +1949,7 @@ show_vhost_user_command_fn (vlib_main_t * vm, vui->regions[j].memory_size, vui->regions[j].userspace_addr, vui->regions[j].mmap_offset, - (u64) vui->region_mmap_addr[j]); + pointer_to_uword( vui->region_mmap_addr[j]) ); } for (q = 0; q < vui->num_vrings; q++) { vlib_cli_output(vm, "\n Virtqueue %d\n", q); @@ -1982,7 +1982,7 @@ show_vhost_user_command_fn (vlib_main_t * vm, vui->vrings[q].desc[j].len, vui->vrings[q].desc[j].flags, vui->vrings[q].desc[j].next, - (u64) map_guest_mem(vui, vui->vrings[q].desc[j].addr));} + pointer_to_uword(map_guest_mem(vui, vui->vrings[q].desc[j].addr)));} } } vlib_cli_output (vm, "\n"); |