From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQMAu-0007dY-1O for qemu-devel@nongnu.org; Sun, 29 Sep 2013 14:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQMAp-0006fA-50 for qemu-devel@nongnu.org; Sun, 29 Sep 2013 14:56:59 -0400 Received: from qemu.weilnetz.de ([37.221.198.45]:39055 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQMAo-0006f2-Up for qemu-devel@nongnu.org; Sun, 29 Sep 2013 14:56:55 -0400 From: Stefan Weil Date: Sun, 29 Sep 2013 20:56:45 +0200 Message-Id: <1380481005-32399-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] exec: Fix prototype of phys_mem_set_alloc and related functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Stefan Weil , Richard Henderson , Markus Armbruster , Alexander Graf phys_mem_alloc and its assigned values qemu_anon_ram_alloc and legacy_s390_alloc must have identical argument lists. legacy_s390_alloc uses the size parameter to call mmap, so size_t is good enough for all of them. This patch fixes compiler errors on i686 Linux hosts: CC alpha-softmmu/exec.o exec.c:752:51: error: initialization from incompatible pointer type [-Werror] exec.c: In function 'qemu_ram_alloc_from_ptr': exec.c:1139:32: error: comparison of distinct pointer types lacks a cast [-Werror] exec.c: In function 'qemu_ram_remap': exec.c:1283:21: error: comparison of distinct pointer types lacks a cast [-Werror] Signed-off-by: Stefan Weil --- exec.c | 4 ++-- include/exec/exec-all.h | 2 +- target-s390x/kvm.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exec.c b/exec.c index 26681ce..1a08115 100644 --- a/exec.c +++ b/exec.c @@ -749,14 +749,14 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, uint16_t section); static subpage_t *subpage_init(AddressSpace *as, hwaddr base); -static void *(*phys_mem_alloc)(ram_addr_t size) = qemu_anon_ram_alloc; +static void *(*phys_mem_alloc)(size_t size) = qemu_anon_ram_alloc; /* * Set a custom physical guest memory alloator. * Accelerators with unusual needs may need this. Hopefully, we can * get rid of it eventually. */ -void phys_mem_set_alloc(void *(*alloc)(ram_addr_t)) +void phys_mem_set_alloc(void *(*alloc)(size_t)) { phys_mem_alloc = alloc; } diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 77242e2..50ecfd4 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -368,7 +368,7 @@ static inline uintptr_t tcg_getra_ext(uintptr_t ra) #if !defined(CONFIG_USER_ONLY) -void phys_mem_set_alloc(void *(*alloc)(ram_addr_t)); +void phys_mem_set_alloc(void *(*alloc)(size_t)); struct MemoryRegion *iotlb_to_region(hwaddr index); bool io_mem_read(struct MemoryRegion *mr, hwaddr addr, diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 4923e0a..d229bdf 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -93,7 +93,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static int cap_sync_regs; -static void *legacy_s390_alloc(ram_addr_t size); +static void *legacy_s390_alloc(size_t size); int kvm_arch_init(KVMState *s) { @@ -325,7 +325,7 @@ int kvm_s390_get_registers_partial(CPUState *cs) * to grow. We also have to use MAP parameters that avoid * read-only mapping of guest pages. */ -static void *legacy_s390_alloc(ram_addr_t size) +static void *legacy_s390_alloc(size_t size) { void *mem; -- 1.7.10.4