From patchwork Fri Jan 11 13:18:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Garzarella X-Patchwork-Id: 10758005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A7B01399 for ; Fri, 11 Jan 2019 13:21:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 817A529841 for ; Fri, 11 Jan 2019 13:21:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 757952991A; Fri, 11 Jan 2019 13:21:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 31A5B29841 for ; Fri, 11 Jan 2019 13:21:15 +0000 (UTC) Received: from localhost ([127.0.0.1]:50127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghwkM-0004aT-R4 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 11 Jan 2019 08:21:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghwiu-0003Nr-1e for qemu-devel@nongnu.org; Fri, 11 Jan 2019 08:19:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghwit-0000cZ-B5 for qemu-devel@nongnu.org; Fri, 11 Jan 2019 08:19:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghwit-0000bm-5h for qemu-devel@nongnu.org; Fri, 11 Jan 2019 08:19:43 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 685028E596; Fri, 11 Jan 2019 13:19:42 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-80.ams2.redhat.com [10.36.117.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE4C05C25A; Fri, 11 Jan 2019 13:19:31 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Fri, 11 Jan 2019 14:18:36 +0100 Message-Id: <20190111131836.107549-5-sgarzare@redhat.com> In-Reply-To: <20190111131836.107549-1-sgarzare@redhat.com> References: <20190111131836.107549-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 Jan 2019 13:19:42 +0000 (UTC) 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 4/4] 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" , Stefan Hajnoczi , George Kennedy , Gerd Hoffmann , Marc-Andre Lureau , Paolo Bonzini , Boris Ostrovsky , Maran Wilson , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use pvh.bin option rom when we are booting an uncompressed kernel using the x86/HVM direct boot ABI. Signed-off-by: Stefano Garzarella Based-on: <1545422632-24444-5-git-send-email-liam.merwick@oracle.com> --- hw/i386/pc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 06bce6a101..deab8a2816 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1005,6 +1005,10 @@ static void load_linux(PCMachineState *pcms, fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, header, sizeof(header)); + option_rom[nb_option_roms].bootindex = 0; + option_rom[nb_option_roms].name = "pvh.bin"; + nb_option_roms++; + return; } /* This looks like a multiboot kernel. If it is, let's stop