From 2b3af999845db4b5546e5d0d46eb615381cd9dc0 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 1 Apr 2010 16:59:51 -0500 Subject: [PATCH] win32: Fix compiler errors from u_int64_t MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit u_int64_t raises compiler error messages: CC libhw32/virtio.o /qemu/ar7/hw/virtio.c: In function ‘virtio_queue_get_avail_size’: /qemu/ar7/hw/virtio.c:776: error: ‘u_int64_t’ undeclared (first use in this function) /qemu/ar7/hw/virtio.c:776: error: (Each undeclared identifier is reported only once /qemu/ar7/hw/virtio.c:776: error: for each function it appears in.) Replacing u_int64_t by uint64_t helps. Cc: Michael S. Tsirkin Cc: Anthony Liguori Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- hw/vhost.c | 6 +++--- hw/virtio.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/vhost.c b/hw/vhost.c index 1e5bc69a7e..ad2f98a8a3 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -357,9 +357,9 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev, { struct vhost_vring_addr addr = { .index = idx, - .desc_user_addr = (u_int64_t)(unsigned long)vq->desc, - .avail_user_addr = (u_int64_t)(unsigned long)vq->avail, - .used_user_addr = (u_int64_t)(unsigned long)vq->used, + .desc_user_addr = (uint64_t)(unsigned long)vq->desc, + .avail_user_addr = (uint64_t)(unsigned long)vq->avail, + .used_user_addr = (uint64_t)(unsigned long)vq->used, .log_guest_addr = vq->used_phys, .flags = enable_log ? (1 << VHOST_VRING_F_LOG) : 0, }; diff --git a/hw/virtio.c b/hw/virtio.c index f54129f658..e7657ae8aa 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -773,7 +773,7 @@ target_phys_addr_t virtio_queue_get_desc_size(VirtIODevice *vdev, int n) target_phys_addr_t virtio_queue_get_avail_size(VirtIODevice *vdev, int n) { return offsetof(VRingAvail, ring) + - sizeof(u_int64_t) * vdev->vq[n].vring.num; + sizeof(uint64_t) * vdev->vq[n].vring.num; } target_phys_addr_t virtio_queue_get_used_size(VirtIODevice *vdev, int n) -- 2.11.4.GIT