diff options
| author | Henning Schild <henning@hennsch.de> | 2012-09-05 14:56:39 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-09-07 15:26:52 +0200 |
| commit | 7e9c7ffe9fd9dfc3d0168dd584936db8144b230b (patch) | |
| tree | b488e761b892682d408db54ce5a8ec1f2b526a88 | |
| parent | 6e4c0d1f03d6ab407509c32fab7cb4b8230f57ff (diff) | |
| download | qemu-7e9c7ffe9fd9dfc3d0168dd584936db8144b230b.tar.gz qemu-7e9c7ffe9fd9dfc3d0168dd584936db8144b230b.tar.bz2 qemu-7e9c7ffe9fd9dfc3d0168dd584936db8144b230b.zip | |
fix entry pointer for ELF kernels loaded with -kernel option
Find a hopefully proper patch attached. Take it or leave it.
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Henning Schild <henning@hennsch.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | 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 fa65ce2f93..731a983854 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); |