From patchwork Tue Jun 16 07:57:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 484824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6EE131401F6 for ; Tue, 16 Jun 2015 18:00:53 +1000 (AEST) Received: from localhost ([::1]:38486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lnf-00087U-OT for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 04:00:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lkW-0003DF-6m for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:57:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4lkT-0005vm-D8 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:57:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lkT-0005vB-8H for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:57:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C7B29373BED for ; Tue, 16 Jun 2015 07:57:32 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-43.ams2.redhat.com [10.36.116.43]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5G7vVG8013866; Tue, 16 Jun 2015 03:57:32 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id E6BE781C6B; Tue, 16 Jun 2015 09:57:28 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 16 Jun 2015 09:57:26 +0200 Message-Id: <1434441446-18930-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1434441446-18930-1-git-send-email-kraxel@redhat.com> References: <1434441446-18930-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PULL 5/5] virtio-vga: add vgabios configuration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add seavgabios configuration for virtio-vga, hook up the new vgabios in the makefiles. Signed-off-by: Gerd Hoffmann --- Makefile | 2 +- roms/Makefile | 2 +- roms/config.vga-virtio | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 roms/config.vga-virtio diff --git a/Makefile b/Makefile index 2d52536..3f97904 100644 --- a/Makefile +++ b/Makefile @@ -342,7 +342,7 @@ bepo cz ifdef INSTALL_BLOBS BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ -vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \ +vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ acpi-dsdt.aml q35-acpi-dsdt.aml \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ diff --git a/roms/Makefile b/roms/Makefile index 610b534..c76cd5b 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -1,5 +1,5 @@ -vgabios_variants := stdvga cirrus vmware qxl isavga +vgabios_variants := stdvga cirrus vmware qxl isavga virtio vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio pxerom_targets := 8086100e 80861209 10500940 10222000 10ec8139 1af41000 diff --git a/roms/config.vga-virtio b/roms/config.vga-virtio new file mode 100644 index 0000000..aa7a15b --- /dev/null +++ b/roms/config.vga-virtio @@ -0,0 +1,6 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y +CONFIG_OVERRIDE_PCI_ID=y +CONFIG_VGA_VID=0x1af4 +CONFIG_VGA_DID=0x1050