From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9FOG-0000XS-K8 for qemu-devel@nongnu.org; Wed, 05 Sep 2012 09:11:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9FOD-0006A9-FV for qemu-devel@nongnu.org; Wed, 05 Sep 2012 09:11:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9FOD-00069z-7i for qemu-devel@nongnu.org; Wed, 05 Sep 2012 09:11:29 -0400 Message-ID: <50474F71.6000001@redhat.com> Date: Wed, 05 Sep 2012 15:11:13 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <354bfe08c6245723a07efecb8da1347f-EhVcX11BQgteRwEVBgsBVggwfgFLV15YQUBGAEFeXC9ZXF0WXV9xH1BLXzBeQkEEV1lcSVlW-webmailer2@server04.webmailer.hosteurope.de> <50472F0E.1030803@redhat.com> <9fb1f27468f3dcfd01078182e18288ae-EhVcX11BQgteRwEVBgsBVggwfgFLV15YQUBGAEFeXC9ZXF0WXV9xH1BLXzBeQkEEV15QR1Fc-webmailer2@server04.webmailer.hosteurope.de> In-Reply-To: <9fb1f27468f3dcfd01078182e18288ae-EhVcX11BQgteRwEVBgsBVggwfgFLV15YQUBGAEFeXC9ZXF0WXV9xH1BLXzBeQkEEV15QR1Fc-webmailer2@server04.webmailer.hosteurope.de> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] fix entry pointer for ELF kernels loaded with -kernel option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Henning Schild Cc: qemu-devel@nongnu.org, Aurelien Jarno Am 05.09.2012 14:56, schrieb Henning Schild: > Find a hopefully proper patch attached. Take it or leave it. > > Signed-off-by: Henning Schild Reviewed-by: Kevin Wolf Aurelien, I think in the past you committed some changes in this area. Does this look good to you and can you get it committed? Kevin > --- > hw/elf_ops.h | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) > > diff --git a/hw/elf_ops.h b/hw/elf_ops.h > index fa65ce2..731a983 100644 > --- a/hw/elf_ops.h > +++ b/hw/elf_ops.h > @@ -269,6 +269,17 @@ static int glue(load_elf, SZ)(const char *name, > int fd, > addr = ph->p_paddr; > } > > + /* the entry pointer in the ELF header is a virtual > + * address, if the text segments paddr and vaddr differ > + * we need to adjust the entry */ > + if (pentry && !translate_fn && > + ph->p_vaddr != ph->p_paddr && > + ehdr.e_entry >= ph->p_vaddr && > + ehdr.e_entry < ph->p_vaddr + ph->p_filesz && > + ph->p_flags & PF_X) { > + *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr; > + } > + > snprintf(label, sizeof(label), "phdr #%d: %s", i, name); > rom_add_blob_fixed(label, data, mem_size, addr); > >