From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] qemu: fix some warnings Date: Mon, 21 Jan 2008 14:06:01 +0100 Message-ID: <479498B9.1000005@siemens.com> References: <47949413.4060804@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: In-Reply-To: <47949413.4060804-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org 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; -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/