]> git.proxmox.com Git - qemu.git/commit
exec.c: Pass correct pointer type to qemu_ram_ptr_length
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 8 Jul 2013 08:44:04 +0000 (09:44 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 18 Jul 2013 04:03:25 +0000 (06:03 +0200)
commitcb85f7ab045e8c05ee182b3573c9aba8e287e36b
tree9aacb41f4cf3a3551a2564026ea7f3f92d175845
parent6453a3a69488196f26d12654c6b148446abdf3d6
exec.c: Pass correct pointer type to qemu_ram_ptr_length

Commit e3127ae0 introduced a problem where we're passing a
hwaddr* to qemu_ram_ptr_length() but it wants a ram_addr_t*;
this will cause problems on 32 bit hosts and in any case
provokes a clang warning on MacOSX:

  CC    arm-softmmu/exec.o
exec.c:2164:46: warning: incompatible pointer types passing 'hwaddr *'
(aka 'unsigned long long *') to parameter of type 'ram_addr_t *'
(aka 'unsigned long *')
[-Wincompatible-pointer-types]
    return qemu_ram_ptr_length(raddr + base, plen);
                                             ^~~~
exec.c:1392:63: note: passing argument to parameter 'size' here
static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size)
                                                              ^

Since this function is only used in one place, change its
prototype to pass a hwaddr* rather than a ram_addr_t*,
rather than contorting the calling code to get the type right.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Riku Voipio <riku.voipio@linaro.org>
Tested-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
exec.c