From 07cdc867f1e12a4e8b4096e7f1f3ffda2f4e7d02 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 6 May 2010 11:14:11 +0200

Subject: [PATCH 11/39] switch vmware_vga to pci vgabios

---

 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.2.3