aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2009-12-04 17:19:25 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-18 11:26:26 -0600
commit092493be3caab1ac77f4223b4c3fb0975d1ed490 (patch)
tree2114404d419f7424302d5ec8332e81654ce0c46f
parent75f124753922451ee697defd81a80a91ce3f9888 (diff)
Fix loading of ELF multiboot kernels
The multiboot implementation assumed that there is only one program header (which contains the entry point) and that the entry point is at the start of the code. This doesn't hold true generally and caused too little data to be loaded. Fix the loading code to pass the whole loaded data to the Multiboot Option ROM. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/loader.c2
-rw-r--r--hw/pc.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/loader.c b/hw/loader.c
index 2d7a2c4954..4c6981fc40 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -718,8 +718,6 @@ int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size)
QTAILQ_FOREACH(rom, &roms, next) {
if (rom->max)
continue;
- if (rom->min > addr)
- continue;
if (rom->min + rom->romsize < addr)
continue;
if (rom->min > end)
diff --git a/hw/pc.c b/hw/pc.c
index 147a9a7022..e8db664115 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -560,19 +560,21 @@ static int load_multiboot(void *fw_cfg,
}
if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */
uint64_t elf_entry;
+ uint64_t elf_low, elf_high;
int kernel_size;
fclose(f);
- kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL,
+ kernel_size = load_elf(kernel_filename, 0, &elf_entry, &elf_low, &elf_high,
0, ELF_MACHINE, 0);
if (kernel_size < 0) {
fprintf(stderr, "Error while loading elf kernel\n");
exit(1);
}
- mh_load_addr = mh_entry_addr = elf_entry;
- mb_kernel_size = kernel_size;
+ mh_load_addr = elf_low;
+ mb_kernel_size = elf_high - elf_low;
+ mh_entry_addr = elf_entry;
mb_kernel_data = qemu_malloc(mb_kernel_size);
- if (rom_copy(mb_kernel_data, elf_entry, kernel_size) != kernel_size) {
+ if (rom_copy(mb_kernel_data, mh_load_addr, mb_kernel_size) != mb_kernel_size) {
fprintf(stderr, "Error while fetching elf kernel from rom\n");
exit(1);
}