summary refs log tree commit diff stats
path: root/hw/mips_jazz.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/mips_jazz.c
parentf0f26a06d51b7e7764f8951cdbf67ac9ad507f6d (diff)
downloadfocaccia-qemu-0d9acba8fddbf970c7353083e6a60b47017ce3e4.tar.gz
focaccia-qemu-0d9acba8fddbf970c7353083e6a60b47017ce3e4.zip
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/mips_jazz.c')
-rw-r--r--hw/mips_jazz.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 955041336b..3734aa918e 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -107,12 +107,10 @@ static void audio_init(qemu_irq *pic)
         AudioState *s;
 
         s = AUD_init();
-        if (s) {
-            for (c = soundhw; c->name; ++c) {
-                if (c->enabled) {
-                    if (c->isa) {
-                        c->init.init_isa(s, pic);
-                    }
+        for (c = soundhw; c->name; ++c) {
+            if (c->enabled) {
+                if (c->isa) {
+                    c->init.init_isa(s, pic);
                 }
             }
         }