From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAldX-0005PE-Pf for qemu-devel@nongnu.org; Wed, 18 Nov 2009 09:35:59 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAldS-0005K9-3K for qemu-devel@nongnu.org; Wed, 18 Nov 2009 09:35:59 -0500 Received: from [199.232.76.173] (port=35784 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAldR-0005Jz-R1 for qemu-devel@nongnu.org; Wed, 18 Nov 2009 09:35:54 -0500 Received: from mail-gx0-f223.google.com ([209.85.217.223]:36016) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAldR-0002SL-6t for qemu-devel@nongnu.org; Wed, 18 Nov 2009 09:35:53 -0500 Received: by gxk23 with SMTP id 23so1274805gxk.2 for ; Wed, 18 Nov 2009 06:35:50 -0800 (PST) Message-ID: <4B04063E.3050104@codemonkey.ws> Date: Wed, 18 Nov 2009 08:35:42 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] multiboot: Fix module loading and setting of mmap References: <20091118140207.GB31670@os.inf.tu-dresden.de> In-Reply-To: <20091118140207.GB31670@os.inf.tu-dresden.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Adam Lackorzynski Cc: qemu-devel@nongnu.org, Alexander Graf Adam Lackorzynski wrote: > Hi, > > 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? > > > Signed-off-by: Adam Lackorzynski > --- > hw/pc.c | 4 ++-- > pc-bios/optionrom/multiboot.S | 5 ++++- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/pc.c b/hw/pc.c > index 7c791c4..1c8f95c 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); > That bit looks right. > 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"; > nb_option_roms++; This bit doesn't. multiboot.bin gets installed in ${prefix}/share/. There is a blob shipped in pc-bios/ so if you do -L $srcdir/pc-bios it should work. However, if you did -L $objdir/pc-bios where $objdir != $srcdir, it would not work without your patch. The same is true for seabios and the other roms. Your patch would break the first two though. I'm not sure we have a great solution. > > return 1; /* yes, we are multiboot */ > 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 > This bit needs to be reviewed/acked by Alex. Regards, Anthony Liguori