From: Markus Armbruster <armbru@redhat.com>
To: BALATON Zoltan <balaton@eik.bme.hu>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel@nongnu.org, mkletzan@redhat.com,
vr_qemu@t-online.de
Subject: Re: [PATCH 02/13] audio: Require AudioState in AUD_add_capture
Date: Thu, 28 Sep 2023 15:01:55 +0200 [thread overview]
Message-ID: <87pm221mf0.fsf@pond.sub.org> (raw)
In-Reply-To: <af692de9-1bde-6af1-2d10-c6398d489673@eik.bme.hu> (BALATON Zoltan's message of "Sat, 23 Sep 2023 13:48:54 +0200 (CEST)")
BALATON Zoltan <balaton@eik.bme.hu> writes:
> On Sat, 23 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 90c7c49d116..42bfa330146 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 looks suspicious to me but I don't know if you can do this. Probably Markus can advise. I would use error_report and abort() or error_setg if you have an errp then return but this func doesn't seem to have errp.
Missed this until now; my apologies.
qapi/error.h:
* Please don't error_setg(&error_fatal, ...), use error_report() and
* exit(), because that's more obvious.
* Likewise, don't error_setg(&error_abort, ...), use assert().
next prev parent reply other threads:[~2023-09-28 13:02 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-23 8:54 [PATCH 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-09-23 8:54 ` [PATCH 01/13] ui/vnc: Require audiodev= to enable audio Paolo Bonzini
2023-09-25 9:05 ` Daniel P. Berrangé
2023-09-23 8:54 ` [PATCH 02/13] audio: Require AudioState in AUD_add_capture Paolo Bonzini
2023-09-23 11:48 ` BALATON Zoltan
2023-09-24 8:53 ` Paolo Bonzini
2023-09-28 11:59 ` BALATON Zoltan
2023-09-28 13:01 ` Markus Armbruster [this message]
2023-09-23 8:54 ` [PATCH 03/13] audio: allow returning an error from the driver init Paolo Bonzini
2023-09-23 8:54 ` [PATCH 04/13] audio: return Error ** from audio_state_by_name Paolo Bonzini
2023-09-23 8:54 ` [PATCH 05/13] audio: commonize voice initialization Paolo Bonzini
2023-09-23 8:54 ` [PATCH 06/13] audio: simplify flow in audio_init Paolo Bonzini
2023-09-23 8:55 ` [PATCH 07/13] audio: remove QEMU_AUDIO_* and -audio-help support Paolo Bonzini
2023-09-23 8:55 ` [PATCH 08/13] Introduce machine property "audiodev" Paolo Bonzini
2023-09-23 8:55 ` [PATCH 09/13] hw/arm: Support machine-default audiodev with fallback Paolo Bonzini
2023-09-23 8:55 ` [PATCH 10/13] hw/ppc: " Paolo Bonzini
2023-09-23 8:55 ` [PATCH 11/13] vt82c686: " Paolo Bonzini
2023-09-23 12:23 ` BALATON Zoltan
2023-09-24 8:53 ` Paolo Bonzini
2023-09-24 12:14 ` BALATON Zoltan
2023-09-24 16:06 ` Paolo Bonzini
2023-09-23 8:55 ` [PATCH 12/13] audio: forbid mixing default audiodev backend and -audiodev Paolo Bonzini
2023-09-23 8:55 ` [PATCH 13/13] audio: forbid default audiodev backend with -nodefaults Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2023-09-28 7:36 [PATCH v2 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-09-28 7:36 ` [PATCH 02/13] audio: Require AudioState in AUD_add_capture Paolo Bonzini
2023-10-02 14:57 [PATCH v4 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-10-02 14:57 ` [PATCH 02/13] audio: Require AudioState in AUD_add_capture Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pm221mf0.fsf@pond.sub.org \
--to=armbru@redhat.com \
--cc=balaton@eik.bme.hu \
--cc=mkletzan@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vr_qemu@t-online.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).