diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-05-06 11:14:11 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-16 08:40:07 -0600 |
| commit | 4eccfec4943db1106c79a01069e18dd4f463219b (patch) | |
| tree | 53e62e73615cdaac9631349b1f6d6cd40621510c /hw | |
| parent | 543f8e3468e6df32bfde8f84ac36d05a7604e082 (diff) | |
| download | qemu-4eccfec4943db1106c79a01069e18dd4f463219b.zip qemu-4eccfec4943db1106c79a01069e18dd4f463219b.tar.gz qemu-4eccfec4943db1106c79a01069e18dd4f463219b.tar.bz2 | |
switch vmware_vga to pci vgabios
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | 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) |