From nobody Fri Nov 7 10:31:19 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 1547661251190226.1836707796915; Wed, 16 Jan 2019 09:54:11 -0800 (PST) Received: from localhost ([127.0.0.1]:33424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjpOE-0004uA-7N for importer@patchew.org; Wed, 16 Jan 2019 12:54:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjpKu-0002ms-F6 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 12:50:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjpKs-0000Tu-3K for qemu-devel@nongnu.org; Wed, 16 Jan 2019 12:50:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33246) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjpKq-0000Lr-76 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 12:50:40 -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 C723CA7876; Wed, 16 Jan 2019 17:50:20 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-83.ams2.redhat.com [10.36.117.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id B030560C44; Wed, 16 Jan 2019 17:50:17 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2019 18:49:40 +0100 Message-Id: <20190116174941.342900-5-sgarzare@redhat.com> In-Reply-To: <20190116174941.342900-1-sgarzare@redhat.com> References: <20190116174941.342900-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.30]); Wed, 16 Jan 2019 17:50: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 v3 4/5] hw/i386/pc: use PVH option rom 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" , Maran Wilson , Stefan Hajnoczi , George Kennedy , Paolo Bonzini , Boris Ostrovsky , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use pvh.bin option rom when we are booting an uncompressed kernel using the x86/HVM direct boot ABI. Signed-off-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi Reviewed-by: Liam Merwick --- hw/i386/pc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9ed5063de8..2833b130ba 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1252,6 +1252,10 @@ static void load_linux(PCMachineState *pcms, initrd_size); } =20 + option_rom[nb_option_roms].bootindex =3D 0; + option_rom[nb_option_roms].name =3D "pvh.bin"; + nb_option_roms++; + return; } /* This looks like a multiboot kernel. If it is, let's stop @@ -1703,6 +1707,7 @@ void xen_load_linux(PCMachineState *pcms) for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || + !strcmp(option_rom[i].name, "pvh.bin") || !strcmp(option_rom[i].name, "multiboot.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } --=20 2.20.1