diff options
| author | Martin Kletzander <mkletzan@redhat.com> | 2023-10-02 16:27:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-03 10:29:40 +0200 |
| commit | cb94ff5f80c537e43c04fa4f071f1df784255310 (patch) | |
| tree | 18907d34d44c8e344ea2174c5bd80e6fa8dc5169 /hw/audio/pcspk.c | |
| parent | 9dcb64c96073e9898105cdbef6553cfef0fadcdb (diff) | |
| download | focaccia-qemu-cb94ff5f80c537e43c04fa4f071f1df784255310.tar.gz focaccia-qemu-cb94ff5f80c537e43c04fa4f071f1df784255310.zip | |
audio: propagate Error * out of audio_init
Starting from audio_driver_init, propagate errors via Error ** so that audio_init_audiodevs can simply pass &error_fatal, and AUD_register_card can signal faiure. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> [Reworked the audio/audio.c parts, while keeping Martin's hw/ changes. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/audio/pcspk.c')
| -rw-r--r-- | hw/audio/pcspk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index daf92a4ce1..fe7f07ced2 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -123,8 +123,6 @@ static int pcspk_audio_init(PCSpkState *s) return 0; } - AUD_register_card(s_spk, &s->card); - s->voice = AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback, &as); if (!s->voice) { AUD_log(s_spk, "Could not open voice\n"); @@ -191,7 +189,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(isadev, &s->ioport, s->iobase); - if (s->card.state) { + if (s->card.state && AUD_register_card(s_spk, &s->card, errp)) { pcspk_audio_init(s); } |