[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/23] tests/vhost-user-bridge: fix build on 32 bit s
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 18/23] tests/vhost-user-bridge: fix build on 32 bit systems |
Date: |
Wed, 24 Feb 2016 22:36:09 +0200 |
Mainly casts between void * and uint64_t, and wrong
format for size_t.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/vhost-user-bridge.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index f2b6c67..0779ba2 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -414,7 +414,7 @@ vubr_message_read(int conn_fd, VhostUserMsg *vmsg)
if (vmsg->size > sizeof(vmsg->payload)) {
fprintf(stderr,
"Error: too big message request: %d, size: vmsg->size: %u, "
- "while sizeof(vmsg->payload) = %lu\n",
+ "while sizeof(vmsg->payload) = %zu\n",
vmsg->request, vmsg->size, sizeof(vmsg->payload));
exit(1);
}
@@ -578,7 +578,7 @@ vubr_post_buffer(VubrDev *dev, VubrVirtq *vq, uint8_t *buf,
int32_t len)
exit(1);
}
- void *chunk_start = (void *)gpa_to_va(dev, desc[i].addr);
+ void *chunk_start = (void *)(uintptr_t)gpa_to_va(dev, desc[i].addr);
uint32_t chunk_len = desc[i].len;
uint32_t chunk_write_len = MIN(remaining_len, chunk_len);
@@ -641,7 +641,7 @@ vubr_process_desc(VubrDev *dev, VubrVirtq *vq)
DPRINT("Chunks: ");
i = d_index;
do {
- void *chunk_start = (void *)gpa_to_va(dev, desc[i].addr);
+ void *chunk_start = (void *)(uintptr_t)gpa_to_va(dev, desc[i].addr);
uint32_t chunk_len = desc[i].len;
assert(!(desc[i].flags & VRING_DESC_F_WRITE));
@@ -861,7 +861,7 @@ vubr_set_mem_table_exec(VubrDev *dev, VhostUserMsg *vmsg)
if (mmap_addr == MAP_FAILED) {
vubr_die("mmap");
}
- dev_region->mmap_addr = (uint64_t) mmap_addr;
+ dev_region->mmap_addr = (uint64_t)(uintptr_t)mmap_addr;
DPRINT(" mmap_addr: 0x%016"PRIx64"\n", dev_region->mmap_addr);
close(vmsg->fds[i]);
@@ -935,9 +935,9 @@ vubr_set_vring_addr_exec(VubrDev *dev, VhostUserMsg *vmsg)
DPRINT(" avail_user_addr: 0x%016llx\n", vra->avail_user_addr);
DPRINT(" log_guest_addr: 0x%016llx\n", vra->log_guest_addr);
- vq->desc = (struct vring_desc *)qva_to_va(dev, vra->desc_user_addr);
- vq->used = (struct vring_used *)qva_to_va(dev, vra->used_user_addr);
- vq->avail = (struct vring_avail *)qva_to_va(dev, vra->avail_user_addr);
+ vq->desc = (struct vring_desc *)(uintptr_t)qva_to_va(dev,
vra->desc_user_addr);
+ vq->used = (struct vring_used *)(uintptr_t)qva_to_va(dev,
vra->used_user_addr);
+ vq->avail = (struct vring_avail *)(uintptr_t)qva_to_va(dev,
vra->avail_user_addr);
vq->log_guest_addr = vra->log_guest_addr;
DPRINT("Setting virtq addresses:\n");
--
MST
- [Qemu-devel] [PULL 08/23] pci core: function pci_host_bus_register() cleanup, (continued)
- [Qemu-devel] [PULL 08/23] pci core: function pci_host_bus_register() cleanup, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 09/23] pci core: function pci_bus_init() cleanup, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 10/23] block-migration: acquire AioContext as necessary, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 11/23] vring: make vring_enable_notification return void, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 12/23] virtio: add AioContext-specific function for host notifiers, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 13/23] virtio: export vring_notify as virtio_should_notify, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 14/23] virtio-blk: fix "disabled data plane" mode, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 16/23] virtio-scsi: do not use vring in dataplane, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 15/23] virtio-blk: do not use vring in dataplane, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 17/23] vring: remove, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 18/23] tests/vhost-user-bridge: fix build on 32 bit systems,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 19/23] q35: Remove old machine versions, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 20/23] machine: Remove no_tco field, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 21/23] ich9: Remove enable_tco arguments from init functions, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 22/23] q35: Remove unused q35-acpi-dsdt.aml file, Michael S. Tsirkin, 2016/02/24
- [Qemu-devel] [PULL 23/23] q35: No need to check gigabyte_align, Michael S. Tsirkin, 2016/02/24