Re: [PATCH] qemu: fix some warnings

Jan Kiszka
2008-01-21T13:06:01Z

Jan Kiszka wrote:
> At this chance, can anyone comment on these uint32_t types?
>
> static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end,
> int memory);
> static void *subpage_init (target_phys_addr_t base, uint32_t *phys,
> int orig_memory);
>
> Shouldn't they be target_phys_addr_t? Can't this cause troubles when
> building 64-bit targets? Looks like it's even a generic qemu issue.

At least it should cause no harm to convert to target_phys_addr_t, so
here is a cleanup patch for qemu/exec.c.

Jan

---
qemu/exec.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

Index: kvm-userspace/qemu/exec.c
===================================================================
--- kvm-userspace.orig/qemu/exec.c
+++ kvm-userspace/qemu/exec.c
@@ -2028,9 +2028,9 @@ static inline void tlb_set_dirty(CPUStat
}
#endif /* defined(CONFIG_USER_ONLY) */

-static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end,
- int memory);
-static void *subpage_init (target_phys_addr_t base, uint32_t *phys,
+static int subpage_register (subpage_t *mmio, target_phys_addr_t start,
+ target_phys_addr_t end, int memory);
+static void *subpage_init (target_phys_addr_t base, target_phys_addr_t *phys,
int orig_memory);
#define CHECK_SUBPAGE(addr, start_addr, start_addr2, end_addr, end_addr2, \
need_subpage) \
@@ -2138,7 +2138,7 @@ ram_addr_t qemu_ram_alloc(unsigned long
{
ram_addr_t addr;
if ((phys_ram_alloc_offset + size) > phys_ram_size) {
- fprintf(stderr, "Not enough memory (requested_size = %lu, max memory = %d)\n",
+ fprintf(stderr, "Not enough memory (requested_size = %lu, max memory = %lu)\n",
size, phys_ram_size);
abort();
}
@@ -2455,8 +2455,8 @@ static CPUWriteMemoryFunc *subpage_write
&subpage_writel,
};

-static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end,
- int memory)
+static int subpage_register (subpage_t *mmio, target_phys_addr_t start,
+ target_phys_addr_t end, int memory)
{
int idx, eidx;

@@ -2478,7 +2478,7 @@ static int subpage_register (subpage_t *
return 0;
}

-static void *subpage_init (target_phys_addr_t base, uint32_t *phys,
+static void *subpage_init (target_phys_addr_t base, target_phys_addr_t *phys,
int orig_memory)
{
subpage_t *mmio;