From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
Kővágó@redhat.com, "Markus Armbruster" <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Michael Walle" <michael@walle.cc>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
Zoltán <DirtY.iCE.hu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 07/15] audio: audiodev= parameters no longer optional when -audiodev present
Date: Wed, 21 Aug 2019 10:41:05 +0200 [thread overview]
Message-ID: <20190821084113.1840-8-kraxel@redhat.com> (raw)
In-Reply-To: <20190821084113.1840-1-kraxel@redhat.com>
From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>
This means you should probably stop using -soundhw (as it doesn't allow
you to specify any options) and add the device manually with -device.
The exception is pcspk, it's currently not possible to manually add it.
To use it with audiodev, use something like this:
-audiodev id=foo,... -global isa-pcspk.audiodev=foo -soundhw pcspk
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: 9072b955acffda13976bca7b61f86d7f708c9269.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 17ef4f498fcd..c99e4ddea4c3 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -101,6 +101,8 @@ const struct mixeng_volume nominal_volume = {
#endif
};
+static bool legacy_config = true;
+
#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED
#error No its not
#else
@@ -1394,7 +1396,7 @@ static AudiodevListEntry *audiodev_find(
* if dev == NULL => legacy implicit initialization, return the already created
* state or create a new one
*/
-static AudioState *audio_init(Audiodev *dev)
+static AudioState *audio_init(Audiodev *dev, const char *name)
{
static bool atexit_registered;
size_t i;
@@ -1408,12 +1410,13 @@ static AudioState *audio_init(Audiodev *dev)
if (dev) {
/* -audiodev option */
+ legacy_config = false;
drvname = AudiodevDriver_str(dev->driver);
} else if (!QTAILQ_EMPTY(&audio_states)) {
- /*
- * todo: check for -audiodev once we have normal audiodev selection
- * support
- */
+ if (!legacy_config) {
+ dolog("You must specify an audiodev= for the device %s\n", name);
+ exit(1);
+ }
return QTAILQ_FIRST(&audio_states);
} else {
/* legacy implicit initialization */
@@ -1520,7 +1523,7 @@ void audio_free_audiodev_list(AudiodevListHead *head)
void AUD_register_card (const char *name, QEMUSoundCard *card)
{
if (!card->state) {
- card->state = audio_init(NULL);
+ card->state = audio_init(NULL, name);
}
card->name = g_strdup (name);
@@ -1546,8 +1549,11 @@ CaptureVoiceOut *AUD_add_capture(
struct capture_callback *cb;
if (!s) {
- /* todo: remove when we have normal audiodev selection support */
- s = audio_init(NULL);
+ if (!legacy_config) {
+ dolog("You must specify audiodev when trying to capture\n");
+ return NULL;
+ }
+ s = audio_init(NULL, NULL);
}
if (audio_validate_settings (as)) {
@@ -1778,7 +1784,7 @@ void audio_init_audiodevs(void)
AudiodevListEntry *e;
QSIMPLEQ_FOREACH(e, &audiodevs, next) {
- audio_init(e->dev);
+ audio_init(e->dev, NULL);
}
}
--
2.18.1
next prev parent reply other threads:[~2019-08-21 8:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 8:40 [Qemu-devel] [PULL 00/15] Audio 20190821 patches Gerd Hoffmann
2019-08-21 8:40 ` [Qemu-devel] [PULL 01/15] audio: Add missing fall through comments Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 02/15] audio: reduce glob_audio_state usage Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 03/15] audio: basic support for multi backend audio Gerd Hoffmann
2019-09-09 17:18 ` Peter Maydell
2019-08-21 8:41 ` [Qemu-devel] [PULL 04/15] audio: add audiodev property to vnc and wav_capture Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 05/15] audio: add audiodev properties to frontends Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 06/15] paaudio: prepare for multiple audiodev Gerd Hoffmann
2019-08-21 8:41 ` Gerd Hoffmann [this message]
2019-08-25 9:44 ` [Qemu-devel] [PULL 07/15] audio: audiodev= parameters no longer optional when -audiodev present Maxim Levitsky
2019-08-25 18:05 ` Zoltán Kővágó
2019-08-25 22:15 ` Maxim Levitsky
2019-08-25 23:34 ` Zoltán Kővágó
2019-08-21 8:41 ` [Qemu-devel] [PULL 08/15] paaudio: do not move stream when sink/source name is specified Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 09/15] paaudio: properly disconnect streams in fini_* Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 10/15] audio: remove audio_MIN, audio_MAX Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 11/15] audio: do not run each backend in audio_run Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 12/15] paaudio: fix playback glitches Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 13/15] audio: remove read and write pcm_ops Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 14/15] audio: use size_t where makes sense Gerd Hoffmann
2019-08-21 8:41 ` [Qemu-devel] [PULL 15/15] audio: fix memory leak reported by ASAN Gerd Hoffmann
2019-08-21 15:58 ` [Qemu-devel] [PULL 00/15] Audio 20190821 patches Peter Maydell
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=20190821084113.1840-8-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=DirtY.iCE.hu@gmail.com \
--cc=Kővágó@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=michael@walle.cc \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@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).