dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0011-switch-vmware_vga-to-pci-vgabios.patch

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