kvm tools: Fix type mismatches on GCC 4.4 on 32-bit systems

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 <mingo@elte.hu>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index c69fcc45270d41663a65bfab55b4951ef646dc7d..3d2fa3bee7b9d63c13a49f72aad728ec820314a2 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/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/tools/kvm/qcow.c b/tools/kvm/qcow.c
index 8e1b70d79441c6fa3f6faab98a246f9931b05597..bb2345ced5ce9a768511d9d346cf298f7b11fb53 100644 (file)
--- a/tools/kvm/qcow.c
+++ b/tools/kvm/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;