From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwVK3-0004G1-Vj for qemu-devel@nongnu.org; Tue, 09 Jul 2013 06:39:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwVJz-0005wE-KQ for qemu-devel@nongnu.org; Tue, 09 Jul 2013 06:39:03 -0400 Received: from afflict.kos.to ([92.243.29.197]:38322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwTaU-0003nQ-40 for qemu-devel@nongnu.org; Tue, 09 Jul 2013 04:47:54 -0400 Date: Tue, 9 Jul 2013 11:47:51 +0300 From: Riku Voipio Message-ID: <20130709084751.GA5365@afflict.kos.to> References: <1373273044-18736-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1373273044-18736-1-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH] exec.c: Pass correct pointer type to qemu_ram_ptr_length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , qemu-devel@nongnu.org, patches@linaro.org 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 > 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 > --- > 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 >