From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhiOp-0004BI-Uk for qemu-devel@nongnu.org; Thu, 01 Oct 2015 14:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhiOk-0004IC-77 for qemu-devel@nongnu.org; Thu, 01 Oct 2015 14:16:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhiOk-0004Hf-2p for qemu-devel@nongnu.org; Thu, 01 Oct 2015 14:16:06 -0400 Date: Thu, 1 Oct 2015 20:15:59 +0200 From: Marc =?UTF-8?B?TWFyw60=?= Message-ID: <20151001201559.4501c813@markmb_rh> In-Reply-To: <20151001160242.GA7766@morn.lan> References: <1443701677-13629-1-git-send-email-markmb@redhat.com> <1443701819-13855-1-git-send-email-markmb@redhat.com> <1443701819-13855-7-git-send-email-markmb@redhat.com> <560D5057.6010308@redhat.com> <20151001160242.GA7766@morn.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 6/7] Make the kernel image in the fw_cfg DMA interface bootable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin O'Connor Cc: Drew , Stefan Hajnoczi , "Gabriel L. Somlo" , qemu-devel@nongnu.org, Gerd Hoffmann , Laszlo Ersek On Thu, 1 Oct 2015 12:02:42 -0400 "Kevin O'Connor" wrote: > On Thu, Oct 01, 2015 at 05:25:11PM +0200, Laszlo Ersek wrote: > > On 10/01/15 14:16, Marc Mar=C3=AD wrote: > > > Add an entry to the bootorder file with name "vmlinux". > > > Give this entry more priority than the romfile. > > >=20 > > > Signed-off-by: Marc Mar=C3=AD > > > --- > > > hw/i386/pc.c | 4 +++- > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > >=20 > > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > > > index 81d93b4..c4c51f7 100644 > > > --- a/hw/i386/pc.c > > > +++ b/hw/i386/pc.c > > > @@ -1012,8 +1012,10 @@ static void load_linux(PCMachineState > > > *pcms, fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, > > > setup_size);=20 > > > option_rom[nb_option_roms].name =3D "linuxboot.bin"; > > > - option_rom[nb_option_roms].bootindex =3D 0; > > > + option_rom[nb_option_roms].bootindex =3D 1; > > > nb_option_roms++; > > > + > > > + add_boot_device_path(0, NULL, "vmlinux"); > > > } > > > =20 > > > #define NE2000_NB_MAX 6 > > >=20 > >=20 > > Where does this idea come from? > >=20 > > This will yet again break the invariant that the bootorder fw_cfg > > file is a list of OpenFirmware device paths. >=20 > I believe it came from a discussion between myself and Marc, because I > did not like the way Marc's original SeaBIOS patches overloaded the > meaning of "genroms/linuxboot.bin" in the bootorder file. I didn't like it either. > [...] > > Given that direct kernel boot is always expected to take priority > > over anything else (which is ensured by this QEMU patch too), can > > bootprio_find_vmlinux() in SeaBIOS just look at the same fw_cfg key > > (0x0008)? >=20 > That's fine with me. Marc - I think qemu_vmlinux_setup() in SeaBIOS > with the following would work: >=20 > void qemu_vmlinux_setup(void) > { > u32 kernel_size; > qemu_cfg_read_entry(&kernel_size, QEMU_CFG_KERNEL_SIZE, > sizeof(kernel_size)); if (kernel_size) > boot_add_qemu_vmlinux("QEMU Kernel image", 0); > } >=20 > Marc, if you're okay with the above, you don't have to keep respinning > patches - I can fix it up upon commit. I'm ok with it Thanks Marc