From nobody Sun Apr 12 06:03:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.com ARC-Seal: i=1; a=rsa-sha256; t=1771306158; cv=none; d=zohomail.com; s=zohoarc; b=HeV47cK0RoP8sdpgT2aE26FH8mx6rj/639/NTp0SXh39spXwRbF7kylJPkyvgKW1jB1r4cgg2L9BXRsjAnncvAcXme0WVQOSijw0Aw/CGqaeAsy57V/4oAX+l0RacY0LxoanFcwQpjW6rmtS3SCg9ugypOCdJr7m4lU5YRjHDRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771306158; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fYgqFZ4oPOcspu6TbeYRGEKZTYe+Bf86zf84nP7o7zQ=; b=YeddKSNOzMg81AdCf/8rX30OJRJFOv+22BIItl3LjFtUI2D5yjzkQ+Z9l1VN0haiBspBM+DS+XkOkXWaZuTBy/y5Dtw7/1TNSXUfvA1Zhmx2oV0VInEtRm7N02+U+CGAKtS6OxSUxTIKaydwggzN3RDxsXtm1D35vq6Lt6fd1QI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771306158467233.37953931443144; Mon, 16 Feb 2026 21:29:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsDcs-0002cb-5k; Tue, 17 Feb 2026 00:27:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsDcm-0002ac-Pj for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsDci-0006cE-Ok for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c37:8aa5:0:640:e6ae:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 75B6E8078A; Tue, 17 Feb 2026 08:27:44 +0300 (MSK) Received: from heifetz-lin.yandex-team.ru (unknown [2a02:6bf:8080:b54::1:2f]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id eRRjrX2Ak0U0-khrc0VDj; Tue, 17 Feb 2026 08:27:43 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1771306064; bh=fYgqFZ4oPOcspu6TbeYRGEKZTYe+Bf86zf84nP7o7zQ=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=hAcY0duxyb4wFoqatHaIJG+Xch4pm0lnEhfTU5NxDt4oL7/EM0vYjVPLcSEEFJczF guUouZLXmU9eHT2UpOuIbF1CItnmq90VEwRt3N/4EHihwUvNU7HkQ6kBVlxDCpogAD QdS8d1SSxfn7Cqi/vzT7S35QAfj/q6snr0mczHYU= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.com From: Sergei Heifetz To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eric Blake , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Fabiano Rosas , Paolo Bonzini , Thomas Huth , Gerd Hoffmann , Laurent Vivier Subject: [PATCH 2/8] ui/vnc: disable audio feature when configured with --disable-audio Date: Tue, 17 Feb 2026 10:27:34 +0500 Message-Id: <20260217052740.114117-3-heifetz@yandex-team.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260217052740.114117-1-heifetz@yandex-team.com> References: <20260217052740.114117-1-heifetz@yandex-team.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.com) X-ZM-MESSAGEID: 1771306162994154100 Content-Type: text/plain; charset="utf-8" Disable the audio feature in VNC when QEMU is configured with `--disable-audio`. Do not compile the corresponding audio-related code. Signed-off-by: Sergei Heifetz --- ui/vnc.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index a61a4f937d..8212d3ce81 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1072,6 +1072,7 @@ static void vnc_update_throttle_offset(VncState *vs) size_t offset =3D vs->client_width * vs->client_height * vs->client_pf.bytes_per_pix= el; =20 +#ifdef CONFIG_AUDIO if (vs->audio_cap) { int bps; switch (vs->as.fmt) { @@ -1091,6 +1092,7 @@ static void vnc_update_throttle_offset(VncState *vs) } offset +=3D vs->as.freq * bps * vs->as.nchannels; } +#endif =20 /* Put a floor of 1MB on offset, so that if we have a large pending * buffer and the display is resized to a small size & back again @@ -1214,6 +1216,7 @@ static int vnc_update_client(VncState *vs, int has_di= rty) return n; } =20 +#ifdef CONFIG_AUDIO /* audio */ static void audio_capture_notify(void *opaque, audcnotification_e cmd) { @@ -1293,6 +1296,7 @@ static void audio_del(VncState *vs) vs->audio_cap =3D NULL; } } +#endif =20 static void vnc_disconnect_start(VncState *vs) { @@ -1332,7 +1336,9 @@ void vnc_disconnect_finish(VncState *vs) #ifdef CONFIG_VNC_SASL vnc_sasl_client_cleanup(vs); #endif /* CONFIG_VNC_SASL */ +#ifdef CONFIG_AUDIO audio_del(vs); +#endif qkbd_state_lift_all_keys(vs->vd->kbd); =20 if (vs->mouse_mode_notifier.notify !=3D NULL) { @@ -2097,6 +2103,7 @@ static void send_ext_key_event_ack(VncState *vs) vnc_flush(vs); } =20 +#ifdef CONFIG_AUDIO static void send_ext_audio_ack(VncState *vs) { vnc_lock_output(vs); @@ -2110,6 +2117,7 @@ static void send_ext_audio_ack(VncState *vs) vnc_unlock_output(vs); vnc_flush(vs); } +#endif =20 static void send_xvp_message(VncState *vs, int code) { @@ -2197,10 +2205,15 @@ static void set_encodings(VncState *vs, int32_t *en= codings, size_t n_encodings) send_ext_key_event_ack(vs); break; case VNC_ENCODING_AUDIO: +#ifdef CONFIG_AUDIO if (vs->vd->audio_be) { vnc_set_feature(vs, VNC_FEATURE_AUDIO); send_ext_audio_ack(vs); } +#else + VNC_DEBUG("Audio encoding received with audio subsystem " + "disabled\n"); +#endif break; case VNC_ENCODING_WMVi: vnc_set_feature(vs, VNC_FEATURE_WMVI); @@ -2394,7 +2407,9 @@ static int protocol_client_msg(VncState *vs, uint8_t = *data, size_t len) { int i; uint16_t limit; - uint32_t freq; + #ifdef CONFIG_AUDIO + uint32_t freq; + #endif VncDisplay *vd =3D vs->vd; =20 if (data[0] > 3) { @@ -2571,7 +2586,9 @@ static int protocol_client_msg(VncState *vs, uint8_t = *data, size_t len) vnc_client_error(vs); break; } - +#ifndef CONFIG_AUDIO + abort(); +#else if (len =3D=3D 2) return 4; =20 @@ -2626,7 +2643,7 @@ static int protocol_client_msg(VncState *vs, uint8_t = *data, size_t len) break; } break; - +#endif default: VNC_DEBUG("Msg: %d\n", read_u16(data, 0)); vnc_client_error(vs); @@ -3369,10 +3386,12 @@ static void vnc_connect(VncDisplay *vd, QIOChannelS= ocket *sioc, vs->last_x =3D -1; vs->last_y =3D -1; =20 +#ifdef CONFIG_AUDIO vs->as.freq =3D 44100; vs->as.nchannels =3D 2; vs->as.fmt =3D AUDIO_FORMAT_S16; vs->as.endianness =3D 0; +#endif =20 qemu_mutex_init(&vs->output_mutex); vs->bh =3D qemu_bh_new(vnc_jobs_bh, vs); @@ -3645,9 +3664,11 @@ static QemuOptsList qemu_vnc_opts =3D { },{ .name =3D "non-adaptive", .type =3D QEMU_OPT_BOOL, +#ifdef CONFIG_AUDIO },{ .name =3D "audiodev", .type =3D QEMU_OPT_STRING, +#endif },{ .name =3D "power-control", .type =3D QEMU_OPT_BOOL, @@ -4080,7 +4101,9 @@ void vnc_display_open(const char *id, Error **errp) const char *saslauthz; int lock_key_sync =3D 1; int key_delay_ms; +#ifdef CONFIG_AUDIO const char *audiodev; +#endif const char *passwordSecret; =20 if (!vd) { @@ -4238,6 +4261,7 @@ void vnc_display_open(const char *id, Error **errp) } vd->ledstate =3D 0; =20 +#ifdef CONFIG_AUDIO audiodev =3D qemu_opt_get(opts, "audiodev"); if (audiodev) { vd->audio_be =3D audio_be_by_name(audiodev, errp); @@ -4247,6 +4271,7 @@ void vnc_display_open(const char *id, Error **errp) } else { vd->audio_be =3D audio_get_default_audio_be(NULL); } +#endif =20 device_id =3D qemu_opt_get(opts, "display"); if (device_id) { --=20 2.34.1