From nobody Fri Nov 7 14:34:58 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; dkim=fail; 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 1548095095756249.76266509741538; Mon, 21 Jan 2019 10:24:55 -0800 (PST) Received: from localhost ([127.0.0.1]:57591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleFi-0001x6-LB for importer@patchew.org; Mon, 21 Jan 2019 13:24:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyI-0004YW-4E for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyH-0004MI-HB for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:54 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyH-0004Ld-Ak for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:53 -0500 Received: by mail-wm1-x344.google.com with SMTP id d15so11710495wmb.3 for ; Mon, 21 Jan 2019 10:06:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=isapDD/k92zIyrTPMlwEunrt36+osWN7J1KaAyd0QAI=; b=rfE+FOU50Kth/JH+ocBxhz+zGsTlCBKYAbRj4OxnTASpsQkec2EHGIhH2p/jc/H+xP y1JkmyJSFUwg9SQuPUgOhaGmwQC6GXSQfXtpH4fthK66wblgrDPN1m3L4ap7ikir5yiW FgajZT6L7+MphvDpfVT6MhzBCJRJr+ZBcXVnuYVirtHnKIahfTmc5o3zXr1MQO/jV+5Y wqiflvp9ZcFeAqvZFWrkjTHo8qpKZLjFv3AGsvkFh0yLBI6n1kTMTJceBHoaMNNHYNDi SAcuG53VCng4PEjQrBNKYibmTLFlBfkfCszbFcAOtbJbQvo4PAhUSwuslxFkMHBoLq2J LkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=isapDD/k92zIyrTPMlwEunrt36+osWN7J1KaAyd0QAI=; b=GbVTJReI+V/SMEFizQoFZnum4YE/krE3myXiVpsn1uyjfYMALSzGi3DzA036RWJQNm PnIBlo7MSv5K1z4fxXdmc46zDXv5nnh7UZXmOtC+PW1C094M0JP7SwmBaO3XFfXpTNqz AmhKl/7wq1O7k81G2P1aSKSJzozE0qxNldAhfLTVbHKd/QzJZ/2NOTOvCKY774MUT2Wf AbQbakPCt61i6oRho42Avx+iLpMFkHkpYh08JY2twPxRuZlSKURTaDlucHsoh2M80EVf SBdeBafyDXTNa5sm0EJgk5VuN7/vrowCfpX2bLF397RfH0y/bkDBPEWpJQ/EZVrY25L2 +gaA== X-Gm-Message-State: AJcUukcCucav9Mv6J4VHP8QOl3QQCawrOELfd0Z8B9Av1c7cRsFgiIwI TPZRbwPTYGdi88zj1/DZUtVDZJPi X-Google-Smtp-Source: ALg8bN6raN2TL5m2HoKDQPNwYMRmup9oJSqjraqkYQK884nH0PuWbNvASIARuQEO2LgrWSF7jgbrvA== X-Received: by 2002:a1c:d082:: with SMTP id h124mr394571wmg.21.1548094012184; Mon, 21 Jan 2019 10:06:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:01 +0100 Message-Id: <1548093980-43088-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PULL 30/49] 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: Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella 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 Based-on: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9ed5063..2833b13 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 1.8.3.1