From patchwork Thu Mar 8 16:59:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Langsdorf X-Patchwork-Id: 145574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BD5E8B6F98 for ; Fri, 9 Mar 2012 03:59:23 +1100 (EST) Received: from localhost ([::1]:34662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5ggT-0001fj-OG for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2012 11:59:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5ggD-0001Jr-Gs for qemu-devel@nongnu.org; Thu, 08 Mar 2012 11:59:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5gg7-00012F-2H for qemu-devel@nongnu.org; Thu, 08 Mar 2012 11:59:05 -0500 Received: from smtp171.dfw.emailsrvr.com ([67.192.241.171]:32854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5gg6-00010H-TA for qemu-devel@nongnu.org; Thu, 08 Mar 2012 11:58:58 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp7.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 7E041258415; Thu, 8 Mar 2012 11:58:56 -0500 (EST) X-Virus-Scanned: OK Received: by smtp7.relay.dfw1a.emailsrvr.com (Authenticated sender: mark.langsdorf-AT-calxeda.com) with ESMTPSA id 245D925865B; Thu, 8 Mar 2012 11:58:56 -0500 (EST) From: Mark Langsdorf To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2012 10:59:11 -0600 Message-Id: <1331225951-31306-1-git-send-email-mark.langsdorf@calxeda.com> X-Mailer: git-send-email 1.7.5.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 67.192.241.171 Cc: agraf@suse.de, Mark Langsdorf , david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH] use an unsigned long for the max_sz parameter in load_image_targphys X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 unsigned long. Signed-off-by: Mark Langsdorf --- hw/loader.c | 4 ++-- hw/loader.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 415cdce..a5333d0 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -103,9 +103,9 @@ 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, unsigned long max_sz) { - int size; + unsigned long size; size = get_image_size(filename); if (size > max_sz) { diff --git a/hw/loader.h b/hw/loader.h index fbcaba9..35c1652 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, + unsigned long 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,