diff options
author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-22 18:20:20 +0000 |
---|---|---|
committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-22 18:20:20 +0000 |
commit | 83c1f87cc8f865f1f55a2e476cd827aa51089e8c (patch) | |
tree | d0e3668ef58d9947a49a2ea8a6946fdf14482d19 /loader.c | |
parent | 4be27dbbde2aed1da305b83043caa6f0f0ca4309 (diff) |
Use load address when loading ELF images.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5513 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'loader.c')
-rw-r--r-- | loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -282,7 +282,7 @@ static void *load_at(int fd, int offset, int size) #include "elf_ops.h" /* return < 0 if error, otherwise the number of bytes loaded in memory */ -int load_elf(const char *filename, int64_t virt_to_phys_addend, +int load_elf(const char *filename, int64_t address_offset, uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr) { int fd, data_order, host_data_order, must_swab, ret; @@ -317,10 +317,10 @@ int load_elf(const char *filename, int64_t virt_to_phys_addend, lseek(fd, 0, SEEK_SET); if (e_ident[EI_CLASS] == ELFCLASS64) { - ret = load_elf64(fd, virt_to_phys_addend, must_swab, pentry, + ret = load_elf64(fd, address_offset, must_swab, pentry, lowaddr, highaddr); } else { - ret = load_elf32(fd, virt_to_phys_addend, must_swab, pentry, + ret = load_elf32(fd, address_offset, must_swab, pentry, lowaddr, highaddr); } |