From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1H6yc0-0000Ns-LD
	for qemu-devel@nongnu.org; Tue, 16 Jan 2007 19:25:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1H6yby-0000Ng-8j
	for qemu-devel@nongnu.org; Tue, 16 Jan 2007 19:25:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1H6yby-0000Nd-4K
	for qemu-devel@nongnu.org; Tue, 16 Jan 2007 19:25:06 -0500
Received: from [147.11.1.11] (helo=mail.wrs.com)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1H6ybx-0006D0-Mr
	for qemu-devel@nongnu.org; Tue, 16 Jan 2007 19:25:05 -0500
Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144])
	by mail.wrs.com (8.13.6/8.13.6) with ESMTP id l0H0P4T0020869
	for <qemu-devel@nongnu.org>; Tue, 16 Jan 2007 16:25:04 -0800 (PST)
Message-ID: <45AD6CDF.6020407@windriver.com>
Date: Tue, 16 Jan 2007 18:25:03 -0600
From: Jason Wessel <jason.wessel@windriver.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] qemu vl.h hw/arm_boot.c hw/integratorcp.c hw/re...
References: <E1H6tS3-0007nV-7l@savannah.gnu.org>
In-Reply-To: <E1H6tS3-0007nV-7l@savannah.gnu.org>
Content-Type: multipart/mixed; boundary="------------070909060904010301070900"
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------070909060904010301070900
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Paul the code change that was checked in here causes the zImage files I 
generate not to work anymore.

Please consider the small patch which fixes the problem.  The load_elf() 
function is returning -1.

signed-off-by: jason.wessel@windriver.com


Paul Brook wrote:
> CVSROOT:	/sources/qemu
> Module name:	qemu
> Changes by:	Paul Brook <pbrook>	07/01/16 18:54:31
>
> Modified files:
> 	.              : vl.h 
> 	hw             : arm_boot.c integratorcp.c realview.c 
> 	                 versatilepb.c 
>
> Log message:
> 	ARM ELF loader.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.172&r2=1.173
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/arm_boot.c?cvsroot=qemu&r1=1.1&r2=1.2
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/integratorcp.c?cvsroot=qemu&r1=1.10&r2=1.11
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/realview.c?cvsroot=qemu&r1=1.2&r2=1.3
> http://cvs.savannah.gnu.org/viewcvs/qemu/hw/versatilepb.c?cvsroot=qemu&r1=1.7&r2=1.8
>
>
> _______________________________________________
> Qemu-devel mailing list
> Qemu-devel@nongnu.org
> http://lists.nongnu.org/mailman/listinfo/qemu-devel
>   


--------------070909060904010301070900
Content-Type: text/plain;
 name="arm_boot_fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="arm_boot_fix.patch"

Index: qemu/hw/arm_boot.c
===================================================================
--- qemu.orig/hw/arm_boot.c
+++ qemu/hw/arm_boot.c
@@ -80,7 +80,7 @@ void arm_load_kernel(CPUState *env, int 
     }
 
     kernel_size = load_elf(kernel_filename, 0, &entry);
-    if (kernel_size) {
+    if (kernel_size > 0) {
         /* An ELF image.  Jump to the entry point.  */
         env->regs[15] = entry & 0xfffffffe;
         env->thumb = entry & 1;

--------------070909060904010301070900--