| Message ID | 20230929085112.983957-3-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanup deprecated audio features, take 2 | expand |
On Fri, 29 Sep 2023, Paolo Bonzini wrote: > From: Martin Kletzander <mkletzan@redhat.com> > > Since all callers require a valid audiodev this function can now safely > abort in case of missing AudioState. > > Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > Message-ID: <c6e87e678e914df0f59da2145c2753cdb4a16f63.1650874791.git.mkletzan@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > audio/audio.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/audio/audio.c b/audio/audio.c > index 2f479657117..4332c4c6ce8 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -1876,10 +1876,9 @@ CaptureVoiceOut *AUD_add_capture( > struct capture_callback *cb; > > if (!s) { > - if (!legacy_config) { > - dolog("Capturing without setting an audiodev is deprecated\n"); > - } > - s = audio_init(NULL, NULL); > + error_setg(&error_abort, > + "Capturing without setting an audiodev is not supported"); > + abort(); This patch is still here but now Markus replied and quoted error.h that says this is wrong, error_abort should not be used in error_setg so this should use error_report instead. Regards, BALATON Zoltan > } > > if (!audio_get_pdo_out(s->dev)->mixing_engine) { >
diff --git a/audio/audio.c b/audio/audio.c index 2f479657117..4332c4c6ce8 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1876,10 +1876,9 @@ CaptureVoiceOut *AUD_add_capture( struct capture_callback *cb; if (!s) { - if (!legacy_config) { - dolog("Capturing without setting an audiodev is deprecated\n"); - } - s = audio_init(NULL, NULL); + error_setg(&error_abort, + "Capturing without setting an audiodev is not supported"); + abort(); } if (!audio_get_pdo_out(s->dev)->mixing_engine) {