From patchwork Wed Nov 18 14:53:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: multiboot: Fix module loading and setting of mmap Date: Wed, 18 Nov 2009 04:53:32 -0000 From: Adam Lackorzynski X-Patchwork-Id: 38750 Message-Id: <20091118145332.GE31670@os.inf.tu-dresden.de> To: Alexander Graf Cc: Anthony Liguori , qemu-devel@nongnu.org On Wed Nov 18, 2009 at 15:33:10 +0100, Alexander Graf wrote: > Adam Lackorzynski wrote: > > I need to following to fix multiboot booting for me. > > > > Should linuxboot.bin and multiboot.bin end up in pc-bios instead of > > pc-bios/optionrom? > > > load_image(initrd_filename, > > mb_kernel_data + mb_mod_start - mh_load_addr); > > > > @@ -720,7 +720,7 @@ static int load_multiboot(void *fw_cfg, > > fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, mb_bootinfo_data, > > sizeof(bootinfo)); > > > > - option_rom[nb_option_roms] = "multiboot.bin"; > > + option_rom[nb_option_roms] = "optionrom/multiboot.bin"; > > > > This is wrong. The .bin file should be in pc-bios. It just doesn't get > copied over as part of the build process, but instead relies on the > committer to make sure the binary is updated on every source change. Ok, didn't know. Thank you both for clarifying! New patch attached. Signed-off-by: Adam Lackorzynski Acked-by: Alexander Graf --- hw/pc.c | 2 +- pc-bios/multiboot.bin | Bin 512 -> 1024 bytes pc-bios/optionrom/multiboot.S | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 7c791c4..6bcfe1b 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -661,7 +661,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 index 59737c3c6798f83c1b35534d7865c79ba9ca3bc8..d7da6e04ad6d71d26f577d9d6a019719bcce8766 100644 GIT binary patch delta 261 zcmXZVu}Z^G6vpv$F1I0cu#I9V4%gzY#MMa$cNeJ-(0mTo!A)Em=wfIHT=E32KEb6f z2@WZAa%&fDzannbhA>QS4*9nc|err{)-{caFW zkS-*`52Rlb!8dr0Vcx-T=_1W#lw+iR82s)bP(*Jwd4ZBNQf*NVi%LEaTeb=1pTyK@ z+^ns}PHl-)KRP1F^qtxdQnO1ag{ZR4?YeL3`o3c=dU$b3KcBZeG`LkZ4HHr0DDm)j sLZm;BWd>vGLhU(Kng}aYiFF^Qsf$Z-!SNZpqTu*}quA%c_PYG^4_6gol>h($ delta 120 zcmZqRXkd{DUB#FdAZK`>??&3f6b8Mt#U_l$*-{u3C-RF+cFSckrZFB)>jcr=au!gI z1>?lS%1k@BCmvOp_`zCCFO8p3EQ2v^2O|Rm1HaM%y|n*&7L1b}8FeS`W7J{=3f^Ow R{EE?l$$@dQBGY6>MgYdxBLx5e diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S index be5c9fc..9131837 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