diff options
| author | Adam Lackorzynski <adam@os.inf.tu-dresden.de> | 2009-11-30 23:25:44 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 15:25:58 -0600 |
| commit | 53ea95de527f146d902aaf442625e0fe6dd25524 (patch) | |
| tree | 72bf9cc03515ad237023f8e0be3dec4b421d0386 | |
| parent | dc61b0dc5a24c7dac5e54a2baf9be235038aae64 (diff) | |
multiboot: Fix module loading and setting of mmap.
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pc.c | 2 | ||||
| -rw-r--r-- | pc-bios/multiboot.bin | bin | 512 -> 1024 bytes | |||
| -rw-r--r-- | pc-bios/optionrom/multiboot.S | 5 |
3 files changed, 5 insertions, 2 deletions
@@ -666,7 +666,7 @@ static int load_multiboot(void *fw_cfg, /* append module data at the end of last module */ mb_kernel_data = qemu_realloc(mb_kernel_data, - mh_load_addr - mb_mod_end); + mb_mod_end - mh_load_addr); load_image(initrd_filename, mb_kernel_data + mb_mod_start - mh_load_addr); diff --git a/pc-bios/multiboot.bin b/pc-bios/multiboot.bin Binary files differindex 59737c3c67..d7da6e04ad 100644 --- a/pc-bios/multiboot.bin +++ b/pc-bios/multiboot.bin diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S index be5c9fcf36..913183739c 100644 --- a/pc-bios/optionrom/multiboot.S +++ b/pc-bios/optionrom/multiboot.S @@ -62,6 +62,9 @@ run_multiboot: add %eax, %ebx movl %ebx, %gs:GS_GDT_DESC + 2 + xor %eax, %eax + mov %eax, %es + /* Read the bootinfo struct into RAM */ read_fw_blob(FW_CFG_INITRD) @@ -71,7 +74,7 @@ run_multiboot: mov %ax, %fs /* ES = mmap_addr */ - mov %eax, %fs:0x48 + mov %fs:48, %eax shr $4, %eax mov %ax, %es |