[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] exec.c: Pass correct pointer type to qemu_ram_p
From: |
Riku Voipio |
Subject: |
Re: [Qemu-devel] [PATCH] exec.c: Pass correct pointer type to qemu_ram_ptr_length |
Date: |
Tue, 9 Jul 2013 11:47:51 +0300 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Mon, Jul 08, 2013 at 09:44:04AM +0100, Peter Maydell wrote:
> 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:
Bumped into this warning when compiling QEMU on ARM host as well,
this pax fixes it.
Tested-by: Riku Voipio <address@hidden>
> 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 <address@hidden>
> ---
> exec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/exec.c b/exec.c
> index 03fdf7e..50d29de 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1389,7 +1389,7 @@ static void *qemu_safe_ram_ptr(ram_addr_t addr)
>
> /* Return a host pointer to guest's ram. Similar to qemu_get_ram_ptr
> * but takes a size argument */
> -static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size)
> +static void *qemu_ram_ptr_length(ram_addr_t addr, hwaddr *size)
> {
> if (*size == 0) {
> return NULL;
> --
> 1.7.11.4
>