summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-16 04:36:48 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-16 04:36:48 +0000
commit4fb3fbc2454273041eef067c8dffeb3cae6ac378 (patch)
tree96512c08aeb9069a9c89205e79f7535a68343a6e /hw/vmware_vga.c
parentInitialize the VMware VGA console after vga_init (Alexander Graf). (diff)
downloadqemu-kvm-4fb3fbc2454273041eef067c8dffeb3cae6ac378.tar.gz
qemu-kvm-4fb3fbc2454273041eef067c8dffeb3cae6ac378.tar.bz2
qemu-kvm-4fb3fbc2454273041eef067c8dffeb3cae6ac378.zip
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
Diffstat (limited to 'hw/vmware_vga.c')
-rw-r--r--hw/vmware_vga.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 12882964c..38bac13b5 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1225,14 +1225,6 @@ void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
s->card.config[0x0c] = 0x08; /* Cache line size */
s->card.config[0x0d] = 0x40; /* Latency timer */
s->card.config[0x0e] = PCI_CLASS_HEADERTYPE_00h;
- s->card.config[0x10] = ((SVGA_IO_BASE >> 0) & 0xff) | 1;
- s->card.config[0x11] = (SVGA_IO_BASE >> 8) & 0xff;
- s->card.config[0x12] = (SVGA_IO_BASE >> 16) & 0xff;
- s->card.config[0x13] = (SVGA_IO_BASE >> 24) & 0xff;
- s->card.config[0x18] = (SVGA_MEM_BASE >> 0) & 0xff;
- s->card.config[0x19] = (SVGA_MEM_BASE >> 8) & 0xff;
- s->card.config[0x1a] = (SVGA_MEM_BASE >> 16) & 0xff;
- s->card.config[0x1b] = (SVGA_MEM_BASE >> 24) & 0xff;
s->card.config[0x2c] = PCI_VENDOR_ID_VMWARE & 0xff;
s->card.config[0x2d] = PCI_VENDOR_ID_VMWARE >> 8;
s->card.config[0x2e] = SVGA_PCI_DEVICE_ID & 0xff;