diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-03 14:03:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-03 14:03:15 +0100 |
| commit | fec105c2abda8567ec15230429c41429b5ee307c (patch) | |
| tree | 447b3226da641771386f7c760ad3d788a3a6c818 | |
| parent | cc6613e244e86c66f83467eab5284825d7057cea (diff) | |
| parent | 4b3b7793e18e1e3edb90bbc21112e875f9ff826d (diff) | |
| download | qemu-fec105c2abda8567ec15230429c41429b5ee307c.zip qemu-fec105c2abda8567ec15230429c41429b5ee307c.tar.gz qemu-fec105c2abda8567ec15230429c41429b5ee307c.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190828-pull-request' into staging
audio: two little fixes.
# gpg: Signature made Wed 28 Aug 2019 12:51:32 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20190828-pull-request:
audio: omitting audiodev= parameter is only deprecated
audio: fix invalid malloc size in audio_create_pdos
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | audio/audio.c | 10 | ||||
| -rw-r--r-- | qemu-deprecated.texi | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/audio/audio.c b/audio/audio.c index 7d71533..e99fcd0 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1412,8 +1412,9 @@ static AudioState *audio_init(Audiodev *dev, const char *name) drvname = AudiodevDriver_str(dev->driver); } else if (!QTAILQ_EMPTY(&audio_states)) { if (!legacy_config) { - dolog("You must specify an audiodev= for the device %s\n", name); - exit(1); + dolog("Device %s: audiodev default parameter is deprecated, please " + "specify audiodev=%s\n", name, + QTAILQ_FIRST(&audio_states)->dev->id); } return QTAILQ_FIRST(&audio_states); } else { @@ -1548,8 +1549,7 @@ CaptureVoiceOut *AUD_add_capture( if (!s) { if (!legacy_config) { - dolog("You must specify audiodev when trying to capture\n"); - return NULL; + dolog("Capturing without setting an audiodev is deprecated\n"); } s = audio_init(NULL, NULL); } @@ -1685,7 +1685,7 @@ void audio_create_pdos(Audiodev *dev) } \ if (!dev->u.driver.has_out) { \ dev->u.driver.out = g_malloc0( \ - sizeof(AudiodevAlsaPerDirectionOptions)); \ + sizeof(Audiodev##pdo_name##PerDirectionOptions)); \ dev->u.driver.has_out = true; \ } \ break diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 00a4b6f..9d74a1c 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -72,6 +72,13 @@ backend settings instead of environment variables. To ease migration to the new format, the ``-audiodev-help'' option can be used to convert the current values of the environment variables to ``-audiodev'' options. +@subsection Creating sound card devices and vnc without audiodev= property (since 4.2) + +When not using the deprecated legacy audio config, each sound card +should specify an @code{audiodev=} property. Additionally, when using +vnc, you should specify an @code{audiodev=} propery if you plan to +transmit audio through the VNC protocol. + @subsection -mon ...,control=readline,pretty=on|off (since 4.1) The @code{pretty=on|off} switch has no effect for HMP monitors, but is |