summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-10-01 16:33:43 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-01-22 07:28:23 +0000
commit3d402831de14d9e23ed8efcfdf81b01a53472fe2 (patch)
treebf07e4c720c9555bd70d93dc6a7545f37242867d /hw/pc.c
parenta369da5f31ddbdeb32a7f76622e480d3995fbb00 (diff)
downloadqemu-3d402831de14d9e23ed8efcfdf81b01a53472fe2.tar.gz
vga: make Cirrus ISA device optional
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 8cb78d9d47..b1fd4b004c 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1080,7 +1080,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
if (pci_bus) {
dev = pci_cirrus_vga_init(pci_bus);
} else {
- dev = isa_cirrus_vga_init(get_system_memory());
+ dev = &isa_create_simple(isa_bus, "isa-cirrus-vga")->qdev;
}
} else if (vmsvga_enabled) {
if (pci_bus) {