Re: [Qemu-devel] qemu vl.h hw/arm_boot.c hw/integratorcp.c hw/re...

[Jason Wessel]

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: address@hidden


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
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/qemu-devel
>   

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;