From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, balaton@eik.bme.hu
Subject: [PATCH v3 13/14] audio: forbid default audiodev backend with -nodefaults
Date: Fri, 29 Sep 2023 10:51:06 +0200 [thread overview]
Message-ID: <20230929085112.983957-14-pbonzini@redhat.com> (raw)
In-Reply-To: <20230929085112.983957-1-pbonzini@redhat.com>
Now that all callers support setting an audiodev, forbid using the default
audiodev if -nodefaults is provided on the command line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/audio.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index f0788345bf8..7cfcbfb6ef1 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1806,10 +1806,12 @@ static AudioState *audio_init(Audiodev *dev)
bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp)
{
if (!card->state) {
- if (!QSIMPLEQ_EMPTY(&audiodevs)) {
+ if (!QSIMPLEQ_EMPTY(&audiodevs) || !defaults_enabled()) {
error_setg(errp, "No audiodev specified for %s", name);
- error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?",
- QSIMPLEQ_FIRST(&audiodevs)->dev->id);
+ if (!QSIMPLEQ_EMPTY(&audiodevs)) {
+ error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?",
+ QSIMPLEQ_FIRST(&audiodevs)->dev->id);
+ }
return false;
}
--
2.41.0
next prev parent reply other threads:[~2023-09-29 8:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 8:50 [PATCH v3 00/14] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-09-29 8:50 ` [PATCH v3 01/14] ui/vnc: Require audiodev= to enable audio Paolo Bonzini
2023-09-29 8:50 ` [PATCH v3 02/14] audio: Require AudioState in AUD_add_capture Paolo Bonzini
2023-09-29 11:36 ` BALATON Zoltan
2023-09-29 8:50 ` [PATCH v3 03/14] audio: allow returning an error from the driver init Paolo Bonzini
2023-09-29 8:50 ` [PATCH v3 04/14] audio: return Error ** from audio_state_by_name Paolo Bonzini
2023-09-29 8:50 ` [PATCH v3 05/14] audio: commonize voice initialization Paolo Bonzini
2023-09-29 8:50 ` [PATCH v3 06/14] audio: simplify flow in audio_init Paolo Bonzini
2023-09-29 8:51 ` [PATCH v3 07/14] audio: remove QEMU_AUDIO_* and -audio-help support Paolo Bonzini
2023-09-29 8:51 ` [PATCH v3 08/14] Introduce machine property "audiodev" Paolo Bonzini
2023-10-03 23:36 ` Bernhard Beschow
2023-09-29 8:51 ` [PATCH v3 09/14] hw/arm: Support machine-default audiodev with fallback Paolo Bonzini
2023-09-29 8:51 ` [PATCH v3 10/14] hw/ppc: " Paolo Bonzini
2023-09-29 8:51 ` [PATCH v3 11/14] vt82c686: " Paolo Bonzini
2023-09-29 11:46 ` BALATON Zoltan
2023-09-29 8:51 ` [PATCH v3 12/14] audio: forbid mixing default audiodev backend and -audiodev Paolo Bonzini
2023-09-29 11:54 ` BALATON Zoltan
2023-09-29 16:37 ` Paolo Bonzini
2023-09-29 8:51 ` Paolo Bonzini [this message]
2023-09-29 8:51 ` [PATCH v3 14/14] audio: propagate Error out of audio_driver_init 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=20230929085112.983957-14-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=balaton@eik.bme.hu \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).