qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wessel <jason.wessel@windriver.com>
To: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] qemu vl.h hw/arm_boot.c hw/integratorcp.c hw/re...
Date: Tue, 16 Jan 2007 18:25:03 -0600	[thread overview]
Message-ID: <45AD6CDF.6020407@windriver.com> (raw)
In-Reply-To: <E1H6tS3-0007nV-7l@savannah.gnu.org>

[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]

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
>   


[-- Attachment #2: arm_boot_fix.patch --]
[-- Type: text/plain, Size: 456 bytes --]

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;

  reply	other threads:[~2007-01-17  0:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-16 18:54 [Qemu-devel] qemu vl.h hw/arm_boot.c hw/integratorcp.c hw/re Paul Brook
2007-01-17  0:25 ` Jason Wessel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-04-30  2:24 Andrzej Zaborowski
2007-05-01  8:58 ` Daniel Silverstone
2007-05-01 17:34   ` andrzej zaborowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45AD6CDF.6020407@windriver.com \
    --to=jason.wessel@windriver.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).