diff options
| author |   Henning Schild <henning@hennsch.de> | 2012-09-05 14:56:39 +0200 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@cardoe.com> | 2012-11-21 15:21:46 -0600 |
| commit | a2ece57dba3b5bdd236d9afe54be5bb1c50a6a26 (patch) | |
| tree | 021dd5061762555e49055a00d8296555edb5da94 | |
| parent | e1000: flush queue whenever can_receive can go from false to true (diff) | |
| download | qemu-kvm-a2ece57dba3b5bdd236d9afe54be5bb1c50a6a26.tar.gz qemu-kvm-a2ece57dba3b5bdd236d9afe54be5bb1c50a6a26.tar.bz2 qemu-kvm-a2ece57dba3b5bdd236d9afe54be5bb1c50a6a26.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>
(cherry picked from commit 7e9c7ffe9fd9dfc3d0168dd584936db8144b230b)
| -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 fa65ce2f9..731a98385 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); |