From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjLen-0001mR-Hj for qemu-devel@nongnu.org; Tue, 15 Jan 2019 05:09:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjLYP-0006T5-Px for qemu-devel@nongnu.org; Tue, 15 Jan 2019 05:02:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43380) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjLYP-0006Ng-JR for qemu-devel@nongnu.org; Tue, 15 Jan 2019 05:02:41 -0500 From: Stefano Garzarella Date: Tue, 15 Jan 2019 11:00:58 +0100 Message-Id: <20190115100058.44712-5-sgarzare@redhat.com> In-Reply-To: <20190115100058.44712-1-sgarzare@redhat.com> References: <20190115100058.44712-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 4/4] hw/i386/pc: use PVH option rom List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Boris Ostrovsky , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , George Kennedy , Marcel Apfelbaum , Paolo Bonzini , Eric Blake , Marc-Andre Lureau , Richard Henderson , Stefan Hajnoczi , Liam Merwick , Maran Wilson 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 06bce6a101..7564ba51d2 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)); =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 @@ -1456,6 +1460,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