From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S78BG-0007id-7N for qemu-devel@nongnu.org; Mon, 12 Mar 2012 12:33:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S78BB-0001mG-5b for qemu-devel@nongnu.org; Mon, 12 Mar 2012 12:33:05 -0400 Received: from smtp141.dfw.emailsrvr.com ([67.192.241.141]:43917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S78BB-0001m1-19 for qemu-devel@nongnu.org; Mon, 12 Mar 2012 12:33:01 -0400 From: Mark Langsdorf Date: Mon, 12 Mar 2012 11:33:25 -0500 Message-Id: <1331570005-18492-1-git-send-email-mark.langsdorf@calxeda.com> In-Reply-To: <1331225951-31306-1-git-send-email-mark.langsdorf@calxeda.com> References: <1331225951-31306-1-git-send-email-mark.langsdorf@calxeda.com> Subject: [Qemu-devel] [PATCH v3] use an uint64_t for the max_sz parameter in load_image_targphys List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mark Langsdorf , agraf@suse.de, armbru@redhat.com, eblake@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Allow load_image_targphys to load files on systems with more than 2G of emulated memory by changing the max_sz parameter from an int to an uint64_t. Signed-off-by: Mark Langsdorf --- Changes from v2 changed max_sz from target_phys_addr_t to uint64_t Changes from v1 changed max_sz from unsigned long to target_phys_addr_t returned size to an int to match get_image_size hw/loader.c | 2 +- hw/loader.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 415cdce..7d64113 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -103,7 +103,7 @@ ssize_t read_targphys(const char *name, /* return the size or -1 if error */ int load_image_targphys(const char *filename, - target_phys_addr_t addr, int max_sz) + target_phys_addr_t addr, uint64_t max_sz) { int size; diff --git a/hw/loader.h b/hw/loader.h index fbcaba9..6da291e 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -4,7 +4,8 @@ /* loader.c */ int get_image_size(const char *filename); int load_image(const char *filename, uint8_t *addr); /* deprecated */ -int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz); +int load_image_targphys(const char *filename, target_phys_addr_t, + uint64_t max_sz); int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr, int big_endian, int elf_machine, -- 1.7.5.4