From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:46085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guNhl-0000YO-Oe for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:33:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guNhk-0001pJ-JY for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:33:57 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guNhi-0001gA-LJ for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:33:54 -0500 Received: by mail-wm1-x343.google.com with SMTP id t200so7440562wmt.0 for ; Thu, 14 Feb 2019 12:33:42 -0800 (PST) Sender: Paolo Bonzini References: <20190214180216.246707-1-sgarzare@redhat.com> <20190214140613-mutt-send-email-mst@kernel.org> From: Paolo Bonzini Message-ID: <43cdfd65-9ef4-df75-7932-3360813025f1@redhat.com> Date: Thu, 14 Feb 2019 21:33:38 +0100 MIME-Version: 1.0 In-Reply-To: <20190214140613-mutt-send-email-mst@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] hw/i386/pc: run the multiboot loader before the PVH loader List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , Stefano Garzarella Cc: qemu-devel@nongnu.org, Richard Henderson , Liam Merwick , Eduardo Habkost , Marcel Apfelbaum , George Kennedy On 14/02/19 20:09, Michael S. Tsirkin wrote: > On Thu, Feb 14, 2019 at 07:02:16PM +0100, Stefano Garzarella wrote: >> Some multiboot images could be in the ELF format. In the current >> implementation QEMU fails because we try to load these images >> as a PVH image. >> >> In order to fix this issue, we should try multiboot first (we >> already check the multiboot magic header before to load it). >> If it is not a multiboot image, we can try the PVH loader. >> >> Fixes: ab969087da6 ("pvh: Boot uncompressed kernel using direct boot ABI", 2019-01-15) >> Reported-by: Paolo Bonzini >> Signed-off-by: Stefano Garzarella > > Reviewed-by: Michael S. Tsirkin > > Paolo can you pls merge since you did the pvh things? Yes, queued. Paolo >> --- >> hw/i386/pc.c | 17 +++++++++++------ >> 1 file changed, 11 insertions(+), 6 deletions(-) >> >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index 3889eccdc3..207c267093 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -1209,6 +1209,17 @@ static void load_linux(PCMachineState *pcms, >> if (ldl_p(header+0x202) == 0x53726448) { >> protocol = lduw_p(header+0x206); >> } else { >> + /* >> + * This could be a multiboot kernel. If it is, let's stop treating it >> + * like a Linux kernel. >> + * Note: some multiboot images could be in the ELF format (the same of >> + * PVH), so we try multiboot first since we check the multiboot magic >> + * header before to load it. >> + */ >> + if (load_multiboot(fw_cfg, f, kernel_filename, initrd_filename, >> + kernel_cmdline, kernel_size, header)) { >> + return; >> + } >> /* >> * Check if the file is an uncompressed kernel file (ELF) and load it, >> * saving the PVH entry point used by the x86/HVM direct boot ABI. >> @@ -1262,12 +1273,6 @@ static void load_linux(PCMachineState *pcms, >> >> return; >> } >> - /* This looks like a multiboot kernel. If it is, let's stop >> - treating it like a Linux kernel. */ >> - if (load_multiboot(fw_cfg, f, kernel_filename, initrd_filename, >> - kernel_cmdline, kernel_size, header)) { >> - return; >> - } >> protocol = 0; >> } >> >> -- >> 2.20.1