openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin Wolf 2009-12-04 17:19:25 +01:00 committed by Anthony Liguori
parent 75f1247539
commit 092493be3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/loader.c
View File

@ -718,8 +718,6 @@ int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size)
QTAILQ_FOREACH(rom, &roms, next) { QTAILQ_FOREACH(rom, &roms, next) {
if (rom->max) if (rom->max)
continue; continue;
if (rom->min > addr)
continue;
if (rom->min + rom->romsize < addr) if (rom->min + rom->romsize < addr)
continue; continue;
if (rom->min > end) if (rom->min > end)

10
hw/pc.c
View File

@ -560,19 +560,21 @@ static int load_multiboot(void *fw_cfg,
} }
if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */ if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */
uint64_t elf_entry; uint64_t elf_entry;
uint64_t elf_low, elf_high;
int kernel_size; int kernel_size;
fclose(f); 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); 0, ELF_MACHINE, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
fprintf(stderr, "Error while loading elf kernel\n"); fprintf(stderr, "Error while loading elf kernel\n");
exit(1); exit(1);
} }
mh_load_addr = mh_entry_addr = elf_entry; mh_load_addr = elf_low;
mb_kernel_size = kernel_size; mb_kernel_size = elf_high - elf_low;
mh_entry_addr = elf_entry;
mb_kernel_data = qemu_malloc(mb_kernel_size); 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"); fprintf(stderr, "Error while fetching elf kernel from rom\n");
exit(1); exit(1);
} }