From: Huawei Xie Date: Thu, 19 Mar 2015 10:43:24 +0000 (+0800) Subject: vhost: fix build X-Git-Tag: spdx-start~9400 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=857af048ac59d7a73735ef3a707c94e1dcc49f5d;p=dpdk.git vhost: fix build Fix the error "missing initializer" and "cast to pointer from integer of different size". For the pointer to integer cast issue, need to investigate changing the typeof mapped_address. Signed-off-by: Huawei Xie Acked-by: Changchun Ouyang --- diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c b/lib/librte_vhost/vhost_user/vhost-net-user.c index 3aa9436dbe..31f1215a91 100644 --- a/lib/librte_vhost/vhost_user/vhost-net-user.c +++ b/lib/librte_vhost/vhost_user/vhost-net-user.c @@ -277,7 +277,7 @@ vserver_new_vq_conn(int fd, void *dat, __rte_unused int *remove) int conn_fd; struct connfd_ctx *ctx; int fh; - struct vhost_device_ctx vdev_ctx = { 0 }; + struct vhost_device_ctx vdev_ctx = { (pid_t)0, 0 }; unsigned int size; conn_fd = accept(fd, NULL, NULL); diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c index 465d3ef69b..c1ffc38b47 100644 --- a/lib/librte_vhost/vhost_user/virtio-net-user.c +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c @@ -83,7 +83,7 @@ free_mem_region(struct virtio_net *dev) for (idx = 0; idx < dev->mem->nregions; idx++) { if (region[idx].mapped_address) { alignment = region[idx].blksz; - munmap((void *) + munmap((void *)(uintptr_t) RTE_ALIGN_FLOOR( region[idx].mapped_address, alignment), RTE_ALIGN_CEIL( @@ -155,7 +155,7 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) RTE_LOG(INFO, VHOST_CONFIG, "mapped region %d fd:%d to %p sz:0x%"PRIx64" off:0x%"PRIx64"\n", - idx, pmsg->fds[idx], (void *)mapped_address, + idx, pmsg->fds[idx], (void *)(uintptr_t)mapped_address, mapped_size, memory.regions[idx].mmap_offset); if (mapped_address == (uint64_t)(uintptr_t)MAP_FAILED) { @@ -194,7 +194,7 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) err_mmap: while (idx--) { alignment = pregion_orig[idx].blksz; - munmap((void *)RTE_ALIGN_FLOOR( + munmap((void *)(uintptr_t)RTE_ALIGN_FLOOR( pregion_orig[idx].mapped_address, alignment), RTE_ALIGN_CEIL(pregion_orig[idx].mapped_size, alignment));