summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 01:10:46 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 01:10:46 +0000
commitd34cab9f49bc3ad83a2a968fc2d2719179db2c15 (patch)
treedee22397a6ebed7b22df70d95ee2730ef8a77b28 /hw/pc.c
parenta4080ece74523492856ac67e709a10675b080da0 (diff)
downloadqemu-d34cab9f49bc3ad83a2a968fc2d2719179db2c15.tar.gz
qemu-d34cab9f49bc3ad83a2a968fc2d2719179db2c15.tar.bz2
qemu-d34cab9f49bc3ad83a2a968fc2d2719179db2c15.zip
VMware SVGA II emulation, by Andrzej Zaborowski.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2579 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 7a156eb9f1..332bb1c687 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -664,6 +664,12 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
isa_cirrus_vga_init(ds, phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size);
}
+ } else if (vmsvga_enabled) {
+ if (pci_enabled)
+ pci_vmsvga_init(pci_bus, ds, phys_ram_base + ram_size,
+ ram_size, vga_ram_size);
+ else
+ fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
} else {
if (pci_enabled) {
pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,