proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-07 05:51:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multiboot: Fix module loading and setting of mmap.

Browse Source 
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>
This commit is contained in:
Adam Lackorzynski 2009-11-30 23:25:44 +01:00 committed by Anthony Liguori
parent dc61b0dc5a
commit 53ea95de52
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pc.c
View File

@ -666,7 +666,7 @@ static int load_multiboot(void *fw_cfg,
/* append module data at the end of last module */ /* append module data at the end of last module */
mb_kernel_data = qemu_realloc(mb_kernel_data, mb_kernel_data = qemu_realloc(mb_kernel_data,
mh_load_addr - mb_mod_end); mb_mod_end - mh_load_addr);
load_image(initrd_filename, load_image(initrd_filename,
mb_kernel_data + mb_mod_start - mh_load_addr); mb_kernel_data + mb_mod_start - mh_load_addr);

BIN
pc-bios/multiboot.bin
View File

Binary file not shown.

5
pc-bios/optionrom/multiboot.S
View File

@ -62,6 +62,9 @@ run_multiboot:
add %eax, %ebx add %eax, %ebx
movl %ebx, %gs:GS_GDT_DESC + 2 movl %ebx, %gs:GS_GDT_DESC + 2
xor %eax, %eax
mov %eax, %es
/* Read the bootinfo struct into RAM */ /* Read the bootinfo struct into RAM */
read_fw_blob(FW_CFG_INITRD) read_fw_blob(FW_CFG_INITRD)
@ -71,7 +74,7 @@ run_multiboot:
mov %ax, %fs mov %ax, %fs
/* ES = mmap_addr */ /* ES = mmap_addr */
mov %eax, %fs:0x48 mov %fs:48, %eax
shr $4, %eax shr $4, %eax
mov %ax, %es mov %ax, %es