|
 |
a81953e |
From 07cdc867f1e12a4e8b4096e7f1f3ffda2f4e7d02 Mon Sep 17 00:00:00 2001
|
|
|
a81953e |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
a81953e |
Date: Thu, 6 May 2010 11:14:11 +0200
|
|
|
a81953e |
Subject: [PATCH 11/39] switch vmware_vga to pci vgabios
|
|
|
a81953e |
|
|
|
a81953e |
---
|
|
|
a81953e |
hw/vmware_vga.c | 7 +------
|
|
|
a81953e |
1 files changed, 1 insertions(+), 6 deletions(-)
|
|
|
a81953e |
|
|
|
a81953e |
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
|
|
|
a81953e |
index 12bff48..682f287 100644
|
|
|
a81953e |
--- a/hw/vmware_vga.c
|
|
|
a81953e |
+++ b/hw/vmware_vga.c
|
|
|
a81953e |
@@ -114,14 +114,12 @@ struct pci_vmsvga_state_s {
|
|
|
a81953e |
# define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT
|
|
|
a81953e |
# define SVGA_IO_MUL 1
|
|
|
a81953e |
# define SVGA_FIFO_SIZE 0x10000
|
|
|
a81953e |
-# define SVGA_MEM_BASE 0xe0000000
|
|
|
a81953e |
# define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA2
|
|
|
a81953e |
#else
|
|
|
a81953e |
# define SVGA_ID SVGA_ID_1
|
|
|
a81953e |
# define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT
|
|
|
a81953e |
# define SVGA_IO_MUL 4
|
|
|
a81953e |
# define SVGA_FIFO_SIZE 0x10000
|
|
|
a81953e |
-# define SVGA_MEM_BASE 0xe0000000
|
|
|
a81953e |
# define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA
|
|
|
a81953e |
#endif
|
|
|
a81953e |
|
|
|
a81953e |
@@ -1171,10 +1169,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
|
|
|
a81953e |
vga_init(&s->vga);
|
|
|
a81953e |
vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);
|
|
|
a81953e |
|
|
|
a81953e |
- vga_init_vbe(&s->vga);
|
|
|
a81953e |
-
|
|
|
a81953e |
- rom_add_vga(VGABIOS_FILENAME);
|
|
|
a81953e |
-
|
|
|
a81953e |
vmsvga_reset(s);
|
|
|
a81953e |
}
|
|
|
a81953e |
|
|
|
a81953e |
@@ -1272,6 +1266,7 @@ static PCIDeviceInfo vmsvga_info = {
|
|
|
a81953e |
.qdev.size = sizeof(struct pci_vmsvga_state_s),
|
|
|
a81953e |
.qdev.vmsd = &vmstate_vmware_vga,
|
|
|
a81953e |
.init = pci_vmsvga_initfn,
|
|
|
a81953e |
+ .romfile = "vgabios-vmware.bin",
|
|
|
a81953e |
};
|
|
|
a81953e |
|
|
|
a81953e |
static void vmsvga_register(void)
|
|
|
a81953e |
--
|
|
|
a81953e |
1.7.2.3
|
|
|
a81953e |
|