2
0
Эх сурвалжийг харах

hw/hppa: Avoid creation of artist if disabled on command line

Do not create the artist graphic card if the user disabled it
with "-global artist.disable=true" on the command line.

Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller 6 сар өмнө
parent
commit
b6247273fb

+ 7 - 4
hw/hppa/machine.c

@@ -366,12 +366,15 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
 
 
     /* Graphics setup. */
     /* Graphics setup. */
     if (machine->enable_graphics && vga_interface_type != VGA_NONE) {
     if (machine->enable_graphics && vga_interface_type != VGA_NONE) {
-        vga_interface_created = true;
         dev = qdev_new("artist");
         dev = qdev_new("artist");
         s = SYS_BUS_DEVICE(dev);
         s = SYS_BUS_DEVICE(dev);
-        sysbus_realize_and_unref(s, &error_fatal);
-        sysbus_mmio_map(s, 0, translate(NULL, LASI_GFX_HPA));
-        sysbus_mmio_map(s, 1, translate(NULL, ARTIST_FB_ADDR));
+        bool disabled = object_property_get_bool(OBJECT(dev), "disable", NULL);
+        if (!disabled) {
+            sysbus_realize_and_unref(s, &error_fatal);
+            vga_interface_created = true;
+            sysbus_mmio_map(s, 0, translate(NULL, LASI_GFX_HPA));
+            sysbus_mmio_map(s, 1, translate(NULL, ARTIST_FB_ADDR));
+        }
     }
     }
 
 
     /* Network setup. */
     /* Network setup. */