Commit 7e9c7ffe authored by Henning Schild's avatar Henning Schild Committed by Aurelien Jarno
Browse files

fix entry pointer for ELF kernels loaded with -kernel option 



 Find a hopefully proper patch attached. Take it or leave it.

Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarHenning Schild <henning@hennsch.de>
Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
parent 6e4c0d1f

hw/elf_ops.h

+11 −0
Original line number Diff line number Diff line
@@ -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);