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: NPaul Brook <paul@codesourcery.com>

audio/audio.c

@@ -1711,6 +1711,10 @@ AudioState *AUD_init (void)
     const char *drvname;
     AudioState *s = &glob_audio_state;
 
+    if (s->drv) {
+        return s;
+    }
+
     LIST_INIT (&s->hw_head_out);
     LIST_INIT (&s->hw_head_in);
     LIST_INIT (&s->cap_head);
@@ -1718,8 +1722,7 @@ AudioState *AUD_init (void)
 
     s->ts = qemu_new_timer (vm_clock, audio_timer, s);
     if (!s->ts) {
-        dolog ("Could not create audio timer\n");
-        return NULL;
+        hw_error("Could not create audio timer\n");
     }
 
     audio_process_options ("AUDIO", audio_options);
@@ -1772,14 +1775,13 @@ AudioState *AUD_init (void)
     if (!done) {
         done = !audio_driver_init (s, &no_audio_driver);
         if (!done) {
-            dolog ("Could not initialize audio subsystem\n");
+            hw_error("Could not initialize audio subsystem\n");
         }
         else {
             dolog ("warning: Using timer based audio emulation\n");
         }
     }
 
-    if (done) {
     VMChangeStateEntry *e;
 
     if (conf.period.hertz <= 0) {
@@ -1789,8 +1791,7 @@ AudioState *AUD_init (void)
                    conf.period.hertz);
         }
         conf.period.ticks = 1;
-        }
-        else {
+    } else {
         conf.period.ticks = ticks_per_sec / conf.period.hertz;
     }
 
@@ -1799,11 +1800,6 @@ AudioState *AUD_init (void)
         dolog ("warning: Could not register change state handler\n"
                "(Audio can continue looping even after stopping the VM)\n");
     }
-    }
-    else {
-        qemu_del_timer (s->ts);
-        return NULL;
-    }
 
     LIST_INIT (&s->card_head);
     register_savevm ("audio", 0, 1, audio_save, audio_load, s);

hw/mips_jazz.c

@@ -107,7 +107,6 @@ 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) {
@@ -116,7 +115,6 @@ static void audio_init(qemu_irq *pic)
             }
         }
     }
-    }
 }
 #endif
 

hw/mips_malta.c

@@ -472,9 +472,8 @@ static void audio_init (PCIBus *pci_bus)
         AudioState *s;
 
         s = AUD_init ();
-        if (s) {
         for (c = soundhw; c->name; ++c) {
-                if (c->enabled)
+            if (c->enabled) {
                 c->init.init_pci (pci_bus, s);
             }
         }

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;

hw/pc.c

@@ -791,7 +791,6 @@ static void audio_init (PCIBus *pci_bus, qemu_irq *pic)
         AudioState *s;
 
         s = AUD_init ();
-        if (s) {
         for (c = soundhw; c->name; ++c) {
             if (c->enabled) {
                 if (c->isa) {
@@ -805,7 +804,6 @@ static void audio_init (PCIBus *pci_bus, qemu_irq *pic)
             }
         }
     }
-    }
 }
 #endif
 

hw/spitz.c

@@ -744,8 +744,6 @@ static void spitz_i2c_setup(PXA2xxState *cpu)
     i2c_slave *wm;
 
     audio = AUD_init();
-    if (!audio)
-        return;
     /* Attach a WM8750 to the bus */
     wm = wm8750_init(bus, audio);