diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-03-16 10:51:31 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-26 14:37:13 +0200 |
| commit | c9073238fcb647644b329705ad54734ad1f0b1a3 (patch) | |
| tree | 2fffdfbc57aeae407c4fce428ddbcf7ce3a15f16 /hw/audio/gus.c | |
| parent | b3da551389c86ce214d5418c174134c3e1c838ab (diff) | |
| download | focaccia-qemu-c9073238fcb647644b329705ad54734ad1f0b1a3.tar.gz focaccia-qemu-c9073238fcb647644b329705ad54734ad1f0b1a3.zip | |
hw/audio: Fix crashes when devices are used on ISA bus without DMA
The cs4231a, gus and sb16 sound cards crash QEMU when the user tries to instantiate them on a machine with DMA-less ISA bus (for example with "qemu-system-mips64el -M mips -device sb16"). Add proper checks to the realize functions to avoid the crashes. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <1521193892-15552-4-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/audio/gus.c')
| -rw-r--r-- | hw/audio/gus.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 3e864cd36d..8e0b27e0f2 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -241,6 +241,12 @@ static void gus_realizefn (DeviceState *dev, Error **errp) IsaDmaClass *k; struct audsettings as; + s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->emu.gusdma); + if (!s->isa_dma) { + error_setg(errp, "ISA controller does not support DMA"); + return; + } + AUD_register_card ("gus", &s->card); as.freq = s->freq; @@ -272,7 +278,6 @@ static void gus_realizefn (DeviceState *dev, Error **errp) isa_register_portio_list(d, &s->portio_list2, (s->port + 0x100) & 0xf00, gus_portio_list2, s, "gus"); - s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->emu.gusdma); k = ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->emu.gusdma, GUS_read_DMA, s); s->emu.himemaddr = s->himem; |