summaryrefslogtreecommitdiffstats
path: root/hw/multiboot.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2010-03-14 21:20:59 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-03-16 08:38:05 +0100
commit409dbce54b57b85bd229174da86d77ca08508508 (patch)
tree61aaddb4700595752b34e01db383074463336329 /hw/multiboot.c
parentcb66ffcf9e298dc1bfc11682172ff9472bcd4495 (diff)
downloadhqemu-409dbce54b57b85bd229174da86d77ca08508508.zip
hqemu-409dbce54b57b85bd229174da86d77ca08508508.tar.gz
load_elf: replace the address addend by a translation function
A few machines need to translate the ELF header addresses into physical addresses. Currently the only possibility is to add a value to the addresses. This patch replaces the addend argument by and a translation function and an opaque passed to the function. A NULL function does not translate the address. The patch also convert all machines that have an addend, simplify the PowerPC kernel loading and fix the MIPS kernel loading using this new feature. Other machines may benefit from this feature. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/multiboot.c')
-rw-r--r--hw/multiboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/multiboot.c b/hw/multiboot.c
index a25fbf6..a1b665c 100644
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -170,8 +170,8 @@ int load_multiboot(void *fw_cfg,
uint64_t elf_low, elf_high;
int kernel_size;
fclose(f);
- kernel_size = load_elf(kernel_filename, 0, &elf_entry, &elf_low, &elf_high,
- 0, ELF_MACHINE, 0);
+ kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
+ &elf_low, &elf_high, 0, ELF_MACHINE, 0);
if (kernel_size < 0) {
fprintf(stderr, "Error while loading elf kernel\n");
exit(1);
OpenPOWER on IntegriCloud