From c4acb6118ff55e579f8d19ad7b46ebadb9155b2b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 13 May 2011 10:19:09 +0200 Subject: [PATCH] kvm tools: Fix type mismatches on GCC 4.4 on 32-bit systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tools/kvm build still fails on 32-bit: cc1: warnings being treated as errors qcow.c: In function ‘qcow1_write_sector’: qcow.c:307: error: comparison between signed and unsigned integer expressions make: *** [qcow.o] Error 1 make: *** Waiting for unfinished jobs.... using: gcc version 4.4.4 20100630 (Red Hat 4.4.4-10) (GCC) The patch below addresses them. Signed-off-by: Ingo Molnar Signed-off-by: Pekka Enberg --- kvm.c | 2 +- qcow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kvm.c b/kvm.c index c69fcc4..3d2fa3b 100644 --- a/kvm.c +++ b/kvm.c @@ -162,7 +162,7 @@ static void kvm_register_mem_slot(struct kvm *kvm, u32 slot, u64 guest_phys, u64 .slot = slot, .guest_phys_addr = guest_phys, .memory_size = size, - .userspace_addr = (u64)userspace_addr, + .userspace_addr = (unsigned long)userspace_addr, }; ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &mem); diff --git a/qcow.c b/qcow.c index 8e1b70d..bb2345c 100644 --- a/qcow.c +++ b/qcow.c @@ -295,7 +295,7 @@ static int qcow1_write_sector(struct disk_image *disk, u64 sector, void *src, u3 { struct qcow *q = disk->priv; struct qcow_header *header = q->header; - ssize_t nr_written; + u32 nr_written; char *buf; u64 offset; ssize_t nr;