From patchwork Mon Feb 4 10:40:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 217879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0EFE42C02A6 for ; Mon, 4 Feb 2013 23:01:48 +1100 (EST) Received: from localhost ([::1]:55417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JgQ-0001KY-U9 for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 05:53:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JfL-0007Bl-P0 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:52:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2JfH-0004I0-D1 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:52:47 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:41327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JfH-0004Hr-5t; Mon, 04 Feb 2013 05:52:43 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 2EC2DA03FA; Mon, 4 Feb 2013 14:52:42 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 620C051A; Mon, 4 Feb 2013 14:41:27 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2013 14:40:29 +0400 Message-Id: <1359974470-17044-20-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Michael Tokarev , qemu-stable@nongnu.org, Aurelien Jarno , Henning Schild Subject: [Qemu-devel] [PATCH 19/60] fix entry pointer for ELF kernels loaded with -kernel option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Henning Schild Find a hopefully proper patch attached. Take it or leave it. Reviewed-by: Kevin Wolf Signed-off-by: Henning Schild Signed-off-by: Aurelien Jarno (cherry picked from commit 7e9c7ffe9fd9dfc3d0168dd584936db8144b230b) Signed-off-by: Michael Tokarev --- hw/elf_ops.h | 11 +++++++++++ 1 file changed, 11 insertions(+) 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);