summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-12-18 08:08:07 +1000
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-19 08:26:23 -0600
commit3c547d7bb7889182d5bcecbb3edea4c71774c6a3 (patch)
treec4d2257aa2119e95d607754f3d190820ddfd7488 /hw/vmware_vga.c
parentvmware: setup PCI BAR 2 for FIFO as per vmware spec (diff)
downloadqemu-kvm-3c547d7bb7889182d5bcecbb3edea4c71774c6a3.tar.gz
qemu-kvm-3c547d7bb7889182d5bcecbb3edea4c71774c6a3.tar.bz2
qemu-kvm-3c547d7bb7889182d5bcecbb3edea4c71774c6a3.zip
Make sure to enable dirty tracking of VBE vram mapping
Apparently, VBE maps the VGA vram to a fixed physical location. KVM requires that all mappings of the VGA vram have dirty tracking enabled on them. Any access to the VGA vram through the VBE mapping currently fails to result in dirty page tracking updates causing a black screen. This is the true root cause of VMware VGA not working correctly under KVM and likely also an issue with some of the std-vga black screen issues too. Cirrus does not enable VBE so it would not be a problem when using Cirrus. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Rebased-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit f0138a63a41fe26bcef61d031ae53d872d12a992)
Diffstat (limited to 'hw/vmware_vga.c')
-rw-r--r--hw/vmware_vga.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 28bbc3fb9..07befc85d 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1129,12 +1129,8 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
vmsvga_screen_dump,
vmsvga_text_update, s);
-#ifdef CONFIG_BOCHS_VBE
- /* XXX: use optimized standard vga accesses */
- cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,
- vga_ram_size, s->vga.vram_offset);
-#endif
- rom_add_vga(VGABIOS_FILENAME);
+ vga_init_vbe(&s->vga);
+ rom_add_vga(VGABIOS_FILENAME);
}
static void pci_vmsvga_map_ioport(PCIDevice *pci_dev, int region_num,