gwj / at91sam9263 · Commits

Commit 4fb3fbc2454273041eef067c8dffeb3cae6ac378

Authored by balrog
1 parent e93a5f4f

Don't overwrite VMwareSVGA's memory region start addresses (malc). 

This was correct also in the Anthony Liguori's patch, but not in mine.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4872 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 0 additions and 8 deletions
hw/vmware_vga.c
  View file @4fb3fbc
@@ -1225,14 +1225,6 @@ void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, @@ -1225,14 +1225,6 @@ void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
1225 s->card.config[0x0c] = 0x08; /* Cache line size */ 1225 s->card.config[0x0c] = 0x08; /* Cache line size */
1226 s->card.config[0x0d] = 0x40; /* Latency timer */ 1226 s->card.config[0x0d] = 0x40; /* Latency timer */
1227 s->card.config[0x0e] = PCI_CLASS_HEADERTYPE_00h; 1227 s->card.config[0x0e] = PCI_CLASS_HEADERTYPE_00h;
1228 - s->card.config[0x10] = ((SVGA_IO_BASE >> 0) & 0xff) | 1;  
1229 - s->card.config[0x11] = (SVGA_IO_BASE >> 8) & 0xff;  
1230 - s->card.config[0x12] = (SVGA_IO_BASE >> 16) & 0xff;  
1231 - s->card.config[0x13] = (SVGA_IO_BASE >> 24) & 0xff;  
1232 - s->card.config[0x18] = (SVGA_MEM_BASE >> 0) & 0xff;  
1233 - s->card.config[0x19] = (SVGA_MEM_BASE >> 8) & 0xff;  
1234 - s->card.config[0x1a] = (SVGA_MEM_BASE >> 16) & 0xff;  
1235 - s->card.config[0x1b] = (SVGA_MEM_BASE >> 24) & 0xff;  
1236 s->card.config[0x2c] = PCI_VENDOR_ID_VMWARE & 0xff; 1228 s->card.config[0x2c] = PCI_VENDOR_ID_VMWARE & 0xff;
1237 s->card.config[0x2d] = PCI_VENDOR_ID_VMWARE >> 8; 1229 s->card.config[0x2d] = PCI_VENDOR_ID_VMWARE >> 8;
1238 s->card.config[0x2e] = SVGA_PCI_DEVICE_ID & 0xff; 1230 s->card.config[0x2e] = SVGA_PCI_DEVICE_ID & 0xff;