diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-09-29 20:56:45 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-14 08:50:34 -0700 |
| commit | 575ddeb459f622a114cbfe37d220c0519ec9c2a4 (patch) | |
| tree | 3f980c78c7c91f3639ac2930273bbb377a31d627 /include/exec | |
| parent | 1cdae4573d7613149348d834c605bfbe3c7d405b (diff) | |
| download | focaccia-qemu-575ddeb459f622a114cbfe37d220c0519ec9c2a4.tar.gz focaccia-qemu-575ddeb459f622a114cbfe37d220c0519ec9c2a4.zip | |
exec: Fix prototype of phys_mem_set_alloc and related functions
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 <sw@weilnetz.de> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-id: 1380481005-32399-1-git-send-email-sw@weilnetz.de Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/exec-all.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 6ad05cacf5..ea90b649d4 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -322,7 +322,7 @@ extern uintptr_t tci_tb_ptr; #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, |