From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 4 Feb 2019 19:35:22 +0100 Message-Id: <1549305379-51117-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 20/77] 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: Stefano Garzarella 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); } + 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 @@ -1712,6 +1716,7 @@ void xen_load_linux(PCMachineState *pcms) for (i = 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); } -- 1.8.3.1