dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0115-fix-entry-pointer-for-ELF-kernels-loaded-with-kernel.patch

5544c1
From 3d24d0452bb11e371c710a68b88f09c3accee51f Mon Sep 17 00:00:00 2001
5544c1
From: Henning Schild <henning@hennsch.de>
5544c1
Date: Wed, 5 Sep 2012 14:56:39 +0200
5544c1
Subject: [PATCH] fix entry pointer for ELF kernels loaded with -kernel option
5544c1
5544c1
 Find a hopefully proper patch attached. Take it or leave it.
5544c1
5544c1
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
5544c1
Signed-off-by: Henning Schild <henning@hennsch.de>
5544c1
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
5544c1
(cherry picked from commit 7e9c7ffe9fd9dfc3d0168dd584936db8144b230b)
5544c1
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 hw/elf_ops.h | 11 +++++++++++
5544c1
 1 file changed, 11 insertions(+)
5544c1
5544c1
diff --git a/hw/elf_ops.h b/hw/elf_ops.h
5544c1
index fa65ce2..731a983 100644
5544c1
--- a/hw/elf_ops.h
5544c1
+++ b/hw/elf_ops.h
5544c1
@@ -269,6 +269,17 @@ static int glue(load_elf, SZ)(const char *name, int fd,
5544c1
                 addr = ph->p_paddr;
5544c1
             }
5544c1
 
5544c1
+            /* the entry pointer in the ELF header is a virtual
5544c1
+             * address, if the text segments paddr and vaddr differ
5544c1
+             * we need to adjust the entry */
5544c1
+            if (pentry && !translate_fn &&
5544c1
+                    ph->p_vaddr != ph->p_paddr &&
5544c1
+                    ehdr.e_entry >= ph->p_vaddr &&
5544c1
+                    ehdr.e_entry < ph->p_vaddr + ph->p_filesz &&
5544c1
+                    ph->p_flags & PF_X) {
5544c1
+                *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr;
5544c1
+            }
5544c1
+
5544c1
             snprintf(label, sizeof(label), "phdr #%d: %s", i, name);
5544c1
             rom_add_blob_fixed(label, data, mem_size, addr);
5544c1
 
5544c1
-- 
5544c1
1.7.12.1
5544c1