From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57056 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oy6LM-0000jX-Pl for qemu-devel@nongnu.org; Tue, 21 Sep 2010 13:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oy6LJ-00041E-2z for qemu-devel@nongnu.org; Tue, 21 Sep 2010 13:09:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1633) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oy6LI-00040s-T7 for qemu-devel@nongnu.org; Tue, 21 Sep 2010 13:09:21 -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 o8LH9Kui030846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 21 Sep 2010 13:09:20 -0400 From: Gerd Hoffmann Date: Tue, 21 Sep 2010 19:09:18 +0200 Message-Id: <1285088958-11120-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1285088958-11120-1-git-send-email-kraxel@redhat.com> References: <1285088958-11120-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH REPOST 3/3] switch vmware_vga to pci vgabios List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 12bff48..682f287 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 @@ -1171,10 +1169,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); } @@ -1272,6 +1266,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) -- 1.7.1