From nobody Mon Feb 9 16:53:08 2026 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549306433001913.9637638513382; Mon, 4 Feb 2019 10:53:53 -0800 (PST) Received: from localhost ([127.0.0.1]:47498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqjNK-0001sY-Vk for importer@patchew.org; Mon, 04 Feb 2019 13:53:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqj6r-00052u-SO for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqj6q-0003UQ-Ij for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:45 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:34970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqj6q-0003SH-16 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:44 -0500 Received: by mail-wm1-x32f.google.com with SMTP id t200so1041648wmt.0 for ; Mon, 04 Feb 2019 10:36:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.36.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:36:41 -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=ArvD2ofpUmAgtiJ4FmlKD/C5lNtZCkxrx6HJEIKMW7U=; b=aKuBvqdAVclOa41dxE4sN0CKkn8rRtAvf0szdraOP5epdSMtmy4qFr4fOu59XuDA5y IKAa84Jv5Z/64qbq//FK1AtWnN5uhrtHz8h9ksAbj0yMDucqwbBQWWdYhrAYZ/w9/ZQ7 Ozjen6H+RH6wZWDj7Nfd+ZLKB+NgKKZueSJmS3aVlIa7F2MYiA1qmu57jU+f60Je/79Z VFTSD5OgxoSIDvjayTkPDqHkZ8Js794Ye6C6NrU01aHt+WakvQ9QGkVXh7N8CqnE/H6f 1enujl21D4njdBWb5LbwUSPmv2QrKcp4+3Pkky7kKxcLpQjYW5HuW4ySK2ei3RWdrFEI 2zTA== 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=ArvD2ofpUmAgtiJ4FmlKD/C5lNtZCkxrx6HJEIKMW7U=; b=YARRaey7y3o1voZFNwiteeJbLRQhTU4i0hvS6FepM0cw3AG/PSWP2p/e/a6maDPLSp xwWQgpJJo6Q5JWF8bHyQBbwSZ6ukznHcFG/I6e1ZgIQfaYowhtfs7xUYHHb+NwC3+e4W e99BaiUIPa9XknqLWYcSGPJRPAcoX5koqYqX+NCaguyAWwYgjoeZSqNagbm6xRIiNQ2v DasNcYwCQDnqg9WyVBKDyZkUJKgfvKQHGS21oM6wGmvFIW03Im5P3vKRLBDgIGJ1hi26 dB03RnV8syVK0lu6gtTLFL4Yze/Gx1XPIXLyROaL7zvvFNYTYz0OUcbtsOgKA3bhHdvJ RI4w== X-Gm-Message-State: AHQUAubmi+Yicb/7f3qfXkE9+hbV1CbJPVhi2klr5BtrBqVFCWqEcQbd 2G51tlHGezBVM/I4jAWz9gjxa6ah X-Google-Smtp-Source: AHgI3IbH7lBBeWGKl1BVTglitbaEn4DqU/1skUJRYsyZKfXYbmkwxpStymSsr0sPfNQZNci0RvhLkA== X-Received: by 2002:a1c:8148:: with SMTP id c69mr557238wmd.126.1549305401697; Mon, 04 Feb 2019 10:36:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:35:22 +0100 Message-Id: <1549305379-51117-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-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::32f Subject: [Qemu-devel] [PULL 20/77] 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 5d61557..9efbd16 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1261,6 +1261,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 @@ -1712,6 +1716,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