From patchwork Fri Oct 15 10:02:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 67917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D305B70E6 for ; Fri, 15 Oct 2010 21:07:17 +1100 (EST) Received: from localhost ([127.0.0.1]:47642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6hBx-0007p7-D9 for incoming@patchwork.ozlabs.org; Fri, 15 Oct 2010 06:07:13 -0400 Received: from [140.186.70.92] (port=35717 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6h7n-0006Gw-2E for qemu-devel@nongnu.org; Fri, 15 Oct 2010 06:02:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6h7l-0007jO-30 for qemu-devel@nongnu.org; Fri, 15 Oct 2010 06:02:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6h7k-0007ik-Rj for qemu-devel@nongnu.org; Fri, 15 Oct 2010 06:02:53 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9FA2p7o022849 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Oct 2010 06:02:51 -0400 Received: from rincewind.home.kraxel.org (vpn2-8-60.ams2.redhat.com [10.36.8.60]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9FA2nIN023522; Fri, 15 Oct 2010 06:02:50 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 49D1845585; Fri, 15 Oct 2010 12:02:47 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 15 Oct 2010 12:02:45 +0200 Message-Id: <1287136966-31632-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1287136966-31632-1-git-send-email-kraxel@redhat.com> References: <1287136966-31632-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 3/4] switch vmware_vga to pci vgabios X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/vmware_vga.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 3d25c14..9337fdb 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -114,14 +114,12 @@ struct pci_vmsvga_state_s { # define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT # define SVGA_IO_MUL 1 # define SVGA_FIFO_SIZE 0x10000 -# define SVGA_MEM_BASE 0xe0000000 # define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA2 #else # define SVGA_ID SVGA_ID_1 # define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT # define SVGA_IO_MUL 4 # define SVGA_FIFO_SIZE 0x10000 -# define SVGA_MEM_BASE 0xe0000000 # define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA #endif @@ -1219,10 +1217,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size) vga_init(&s->vga); vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); - vga_init_vbe(&s->vga); - - rom_add_vga(VGABIOS_FILENAME); - vmsvga_reset(s); } @@ -1320,6 +1314,7 @@ static PCIDeviceInfo vmsvga_info = { .qdev.size = sizeof(struct pci_vmsvga_state_s), .qdev.vmsd = &vmstate_vmware_vga, .init = pci_vmsvga_initfn, + .romfile = "vgabios-vmware.bin", }; static void vmsvga_register(void)