From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9DEU-0007yv-9H for qemu-devel@nongnu.org; Wed, 05 Sep 2012 06:53:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9DEN-0001a7-LY for qemu-devel@nongnu.org; Wed, 05 Sep 2012 06:53:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9DEN-0001a2-Bn for qemu-devel@nongnu.org; Wed, 05 Sep 2012 06:53:11 -0400 Message-ID: <50472F0E.1030803@redhat.com> Date: Wed, 05 Sep 2012 12:53:02 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <354bfe08c6245723a07efecb8da1347f-EhVcX11BQgteRwEVBgsBVggwfgFLV15YQUBGAEFeXC9ZXF0WXV9xH1BLXzBeQkEEV1lcSVlW-webmailer2@server04.webmailer.hosteurope.de> In-Reply-To: <354bfe08c6245723a07efecb8da1347f-EhVcX11BQgteRwEVBgsBVggwfgFLV15YQUBGAEFeXC9ZXF0WXV9xH1BLXzBeQkEEV1lcSVlW-webmailer2@server04.webmailer.hosteurope.de> Content-Type: text/plain; charset=UTF-8 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 Am 05.09.2012 11:05, schrieb Henning Schild: > This patch fixes a bug in qemu which prevents Multiboot ELF kernels > from being loaded with the -kernel option. Find a full description of > the problem here https://bugs.launchpad.net/qemu/+bug/1044727 . The logic looks good to me, but there are a few points about the patch itself (see http://wiki.qemu.org/Contribute/SubmitAPatch). First thing is that the patch needs a proper Signed-off-by line. This is absolutely crucial. The other points could be fixed manually by a potential patient enough maintainer, but you are the only one who can provide the Signed-off-by. Without it, the patch won't be applied. > --- > hw/elf_ops.h | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/hw/elf_ops.h b/hw/elf_ops.h > index fa65ce2..aeddd11 100644 > --- a/hw/elf_ops.h > +++ b/hw/elf_ops.h > @@ -269,6 +269,16 @@ static int glue(load_elf, SZ)(const char *name, > int fd, The patch is corrupted by line wraps. Using git format-patch/send-email avoids this kind of problems. Alternatively, attach the patch in addition so that an uncorrupted version can be used for applying it. > 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; The coding style problem that was already mentioned. qemu puts braces even for single statements. Kevin