diff options
| author | Eduardo Habkost | 2016-04-19 21:55:25 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2016-05-20 19:28:54 +0200 |
| commit | cfc58cf37362a931990efc75f3f580dfec49ac1e (patch) | |
| tree | 86de8478715152ed258c1db3c100efc4d37158c2 /hw/sparc | |
| parent | milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create() (diff) | |
| download | qemu-cfc58cf37362a931990efc75f3f580dfec49ac1e.tar.gz qemu-cfc58cf37362a931990efc75f3f580dfec49ac1e.tar.xz qemu-cfc58cf37362a931990efc75f3f580dfec49ac1e.zip | |
vl: Replace DT_NOGRAPHIC with machine option
All DisplayType values are just UI options that don't affect any
hardware emulation code, except for DT_NOGRAPHIC. Replace
DT_NOGRAPHIC with DT_NONE plus a new "-machine graphics=on|off"
option, so hardware emulation code don't need to use the
display_type variable.
Cc: Michael Walle <michael@walle.cc>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/sparc')
| -rw-r--r-- | hw/sparc/sun4m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 7bfc00abc2..478fda8209 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1000,7 +1000,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus); slavio_serial_ms_kbd_init(hwdef->ms_kb_base, slavio_irq[14], - display_type == DT_NOGRAPHIC, ESCC_CLOCK, 1); + !machine->enable_graphics, ESCC_CLOCK, 1); /* Slavio TTYA (base+4, Linux ttyS0) is the first QEMU serial device Slavio TTYB (base+0, Linux ttyS1) is the second QEMU serial device */ escc_init(hwdef->serial_base, slavio_irq[15], slavio_irq[15], |