From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Martin Kletzander <mkletzan@redhat.com>
Subject: [PULL 11/12] ui/vnc: Require audiodev= to enable audio
Date: Fri, 22 Sep 2023 11:31:24 +0200 [thread overview]
Message-ID: <20230922093126.264016-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20230922093126.264016-1-pbonzini@redhat.com>
From: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Message-ID: <a07513f1bf6123fef52ff5e7943f5704746b376b.1650874791.git.mkletzan@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
docs/about/deprecated.rst | 8 +++-----
docs/about/removed-features.rst | 6 ++++++
ui/vnc.c | 10 ++++++++--
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index b9cdd2dd03b..40845b3fcb7 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -37,13 +37,11 @@ coverage.
System emulator command line arguments
--------------------------------------
-Creating sound card devices and vnc without ``audiodev=`` property (since 4.2)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+Creating sound card devices without ``audiodev=`` property (since 4.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
When not using the deprecated legacy audio config, each sound card
-should specify an ``audiodev=`` property. Additionally, when using
-vnc, you should specify an ``audiodev=`` property if you plan to
-transmit audio through the VNC protocol.
+should specify an ``audiodev=`` property.
Short-form boolean options (since 6.0)
''''''''''''''''''''''''''''''''''''''
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 63458736ee1..7668ddef178 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -442,6 +442,12 @@ line using a ``secret`` object instance.
The ``-audiodev`` and ``-audio`` command line options are now the only
way to specify audio backend settings.
+Creating vnc without ``audiodev=`` property (removed in 8.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+When using vnc, you should specify an ``audiodev=`` property if
+you plan to transmit audio through the VNC protocol.
+
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/ui/vnc.c b/ui/vnc.c
index 6fd86996a54..cfa18bbd3e1 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2508,11 +2508,17 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
switch (read_u16 (data, 2)) {
case VNC_MSG_CLIENT_QEMU_AUDIO_ENABLE:
trace_vnc_msg_client_audio_enable(vs, vs->ioc);
- audio_add(vs);
+ if (vs->vd->audio_state) {
+ audio_add(vs);
+ } else {
+ error_report("audio not available, use audiodev= option for vnc");
+ }
break;
case VNC_MSG_CLIENT_QEMU_AUDIO_DISABLE:
trace_vnc_msg_client_audio_disable(vs, vs->ioc);
- audio_del(vs);
+ if (vs->vd->audio_state) {
+ audio_del(vs);
+ }
break;
case VNC_MSG_CLIENT_QEMU_AUDIO_SET_FORMAT:
if (len == 4)
--
2.41.0
next prev parent reply other threads:[~2023-09-22 9:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 9:31 [PULL 00/12] Audio, i386 patches for 2022-09-22 Paolo Bonzini
2023-09-22 9:31 ` [PULL 01/12] target/i386: enumerate bit 56 of MSR_IA32_VMX_BASIC Paolo Bonzini
2023-09-22 9:31 ` [PULL 02/12] target/i386: Export GDS_NO bit to guests Paolo Bonzini
2023-09-22 9:31 ` [PULL 03/12] qemu/timer: Add host ticks function for RISC-V Paolo Bonzini
2023-09-22 9:31 ` [PULL 04/12] audio: remove QEMU_AUDIO_* and -audio-help support Paolo Bonzini
2023-09-22 9:31 ` [PULL 05/12] hw/input/tsc210x: Extract common init code into new function Paolo Bonzini
2023-09-22 9:31 ` [PULL 06/12] hw/audio: Simplify hda audio init Paolo Bonzini
2023-09-22 9:31 ` [PULL 07/12] hw/audio/lm4549: Add errp error reporting to init function Paolo Bonzini
2023-09-22 9:31 ` [PULL 08/12] hw/display/xlnx_dp.c: Add audiodev property Paolo Bonzini
2023-09-22 9:31 ` [PULL 09/12] tests/qtest: Specify audiodev= and -audiodev Paolo Bonzini
2023-09-22 9:31 ` [PULL 10/12] audio/spiceaudio: Fail initialisation when not using spice Paolo Bonzini
2023-09-22 9:31 ` Paolo Bonzini [this message]
2023-09-22 9:31 ` [PULL 12/12] 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=20230922093126.264016-12-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=mkletzan@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).