aboutsummaryrefslogtreecommitdiff
path: root/hw/musicpal.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-12 12:02:38 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-12 12:02:38 +0100
commit0d9acba8fddbf970c7353083e6a60b47017ce3e4 (patch)
treed4b709ce317ced6e21ea29378d00a0b5dd6c6bf6 /hw/musicpal.c
parentf0f26a06d51b7e7764f8951cdbf67ac9ad507f6d (diff)
Make AUD_init failure fatal
Failure to initialize the audio subsystem is not handled consistently. Where it is handled it has guest visible effects, which is wrong. We already have a "nosound" audio driver as a last resort, so trying to proceed without an audio backend seems pointless. Also protect against multiple calls to AUD_init so that this can be pushed down into individual devices. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/musicpal.c')
-rw-r--r--hw/musicpal.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c
index b698610b90..0c47e5d80d 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -428,10 +428,6 @@ static i2c_interface *musicpal_audio_init(qemu_irq irq)
int iomemtype;
audio = AUD_init();
- if (!audio) {
- AUD_log(audio_name, "No audio state\n");
- return NULL;
- }
s = qemu_mallocz(sizeof(musicpal_audio_state));
s->irq = irq;