From nobody Sat Nov 8 06:05:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550168501040767.1862091790753; Thu, 14 Feb 2019 10:21:41 -0800 (PST) Received: from localhost ([127.0.0.1]:52910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guLdg-000449-TU for importer@patchew.org; Thu, 14 Feb 2019 13:21:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guLSS-0004M1-Kh for qemu-devel@nongnu.org; Thu, 14 Feb 2019 13:10:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guLSR-0000nK-SQ for qemu-devel@nongnu.org; Thu, 14 Feb 2019 13:10:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guLSR-0000jG-MS for qemu-devel@nongnu.org; Thu, 14 Feb 2019 13:09:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3525689C3A; Thu, 14 Feb 2019 18:02:21 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-144.ams2.redhat.com [10.36.116.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id D261060BEC; Thu, 14 Feb 2019 18:02:17 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:02:16 +0100 Message-Id: <20190214180216.246707-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 14 Feb 2019 18:02:21 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/i386/pc: run the multiboot loader before the PVH loader X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , George Kennedy , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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: Alex Benn=C3=A9e Reviewed-by: Michael S. Tsirkin Tested-by: Alex Benn=C3=A9e --- 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) =3D=3D 0x53726448) { protocol =3D 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 sam= e of + * PVH), so we try multiboot first since we check the multiboot ma= gic + * 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, =20 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 =3D 0; } =20 --=20 2.20.1