summaryrefslogtreecommitdiffstats
path: root/hw/mips/mips_fulong2e.c
diff options
context:
space:
mode:
authorPaolo Bonzini2019-03-19 15:37:19 +0100
committerPaolo Bonzini2019-05-17 15:19:38 +0200
commit78c37d88f1b8b0b3ebcc632c458f0c3779fe2951 (patch)
treeb7183e15274ccfc9ec496aba5262cc78aadba0f0 /hw/mips/mips_fulong2e.c
parenthw/i386/acpi: Assert a pointer is not null BEFORE using it (diff)
downloadqemu-78c37d88f1b8b0b3ebcc632c458f0c3779fe2951.tar.gz
qemu-78c37d88f1b8b0b3ebcc632c458f0c3779fe2951.tar.xz
qemu-78c37d88f1b8b0b3ebcc632c458f0c3779fe2951.zip
mips-fulong2e: obey -vga none
Do not create an ATI VGA if "-vga none" was passed on the command line. Cc: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips/mips_fulong2e.c')
-rw-r--r--hw/mips/mips_fulong2e.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 9d7480ed31..05a5a823a1 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -349,10 +349,12 @@ static void mips_fulong2e_init(MachineState *machine)
&smbus, &isa_bus);
/* GPU */
- dev = DEVICE(pci_create(pci_bus, -1, "ati-vga"));
- qdev_prop_set_uint32(dev, "vgamem_mb", 16);
- qdev_prop_set_uint16(dev, "x-device-id", 0x5159);
- qdev_init_nofail(dev);
+ if (vga_interface_type != VGA_NONE) {
+ dev = DEVICE(pci_create(pci_bus, -1, "ati-vga"));
+ qdev_prop_set_uint32(dev, "vgamem_mb", 16);
+ qdev_prop_set_uint16(dev, "x-device-id", 0x5159);
+ qdev_init_nofail(dev);
+ }
/* Populate SPD eeprom data */
spd_data = spd_data_generate(DDR, ram_size, &err);