{"id":2197101,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197101/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260217052740.114117-3-heifetz@yandex-team.com>","date":"2026-02-17T05:27:34","name":"[2/8] ui/vnc: disable audio feature when configured with --disable-audio","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ddf39f33725d2b4a45dd5a30b81e311e4dc40dbc","submitter":{"id":92578,"url":"http://patchwork.ozlabs.org/api/1.0/people/92578/?format=json","name":"Sergei Heifetz","email":"heifetz@yandex-team.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260217052740.114117-3-heifetz@yandex-team.com/mbox/","series":[{"id":492371,"url":"http://patchwork.ozlabs.org/api/1.0/series/492371/?format=json","date":"2026-02-17T05:27:32","name":"add build option to disable audio subsystem","version":1,"mbox":"http://patchwork.ozlabs.org/series/492371/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2197101/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=yandex-team.com header.i=@yandex-team.com\n header.a=rsa-sha256 header.s=default header.b=hAcY0dux;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net;\n dkim=pass header.i=@yandex-team.com"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fFSqz3jTYz1xpl\n\tfor ; Tue, 17 Feb 2026 16:29:19 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vsDcs-0002cb-5k; Tue, 17 Feb 2026 00:27:58 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsDcm-0002ac-Pj\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500","from forwardcorp1b.mail.yandex.net\n ([2a02:6b8:c02:900:1:45:d181:df01])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsDci-0006cE-Ok\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500","from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net\n (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net\n [IPv6:2a02:6b8:c37:8aa5:0:640:e6ae:0])\n by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 75B6E8078A;\n Tue, 17 Feb 2026 08:27:44 +0300 (MSK)","from heifetz-lin.yandex-team.ru (unknown [2a02:6bf:8080:b54::1:2f])\n by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net\n (smtpcorp/Yandex) with ESMTPSA id eRRjrX2Ak0U0-khrc0VDj;\n 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;\n s=default; t=1771306064;\n bh=fYgqFZ4oPOcspu6TbeYRGEKZTYe+Bf86zf84nP7o7zQ=;\n h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From;\n b=hAcY0duxyb4wFoqatHaIJG+Xch4pm0lnEhfTU5NxDt4oL7/EM0vYjVPLcSEEFJczF\n guUouZLXmU9eHT2UpOuIbF1CItnmq90VEwRt3N/4EHihwUvNU7HkQ6kBVlxDCpogAD\n QdS8d1SSxfn7Cqi/vzT7S35QAfj/q6snr0mczHYU=","From":"Sergei Heifetz ","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?=\n\t=?utf-8?q?lex_Benn=C3=A9e?= ,\n Eric Blake ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\t=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ,\n Markus Armbruster , Fabiano Rosas ,\n Paolo Bonzini , Thomas Huth ,\n Gerd Hoffmann , Laurent Vivier ","Subject":"[PATCH 2/8] ui/vnc: disable audio feature when configured with\n --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":"8bit","Received-SPF":"pass client-ip=2a02:6b8:c02:900:1:45:d181:df01;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Disable the audio feature in VNC when QEMU is configured with\n`--disable-audio`. Do not compile the corresponding audio-related\ncode.\n\nSigned-off-by: Sergei Heifetz \n---\n ui/vnc.c | 31 ++++++++++++++++++++++++++++---\n 1 file changed, 28 insertions(+), 3 deletions(-)","diff":"diff --git a/ui/vnc.c b/ui/vnc.c\nindex a61a4f937d..8212d3ce81 100644\n--- a/ui/vnc.c\n+++ b/ui/vnc.c\n@@ -1072,6 +1072,7 @@ static void vnc_update_throttle_offset(VncState *vs)\n size_t offset =\n vs->client_width * vs->client_height * vs->client_pf.bytes_per_pixel;\n \n+#ifdef CONFIG_AUDIO\n if (vs->audio_cap) {\n int bps;\n switch (vs->as.fmt) {\n@@ -1091,6 +1092,7 @@ static void vnc_update_throttle_offset(VncState *vs)\n }\n offset += vs->as.freq * bps * vs->as.nchannels;\n }\n+#endif\n \n /* Put a floor of 1MB on offset, so that if we have a large pending\n * buffer and the display is resized to a small size & back again\n@@ -1214,6 +1216,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)\n return n;\n }\n \n+#ifdef CONFIG_AUDIO\n /* audio */\n static void audio_capture_notify(void *opaque, audcnotification_e cmd)\n {\n@@ -1293,6 +1296,7 @@ static void audio_del(VncState *vs)\n vs->audio_cap = NULL;\n }\n }\n+#endif\n \n static void vnc_disconnect_start(VncState *vs)\n {\n@@ -1332,7 +1336,9 @@ void vnc_disconnect_finish(VncState *vs)\n #ifdef CONFIG_VNC_SASL\n vnc_sasl_client_cleanup(vs);\n #endif /* CONFIG_VNC_SASL */\n+#ifdef CONFIG_AUDIO\n audio_del(vs);\n+#endif\n qkbd_state_lift_all_keys(vs->vd->kbd);\n \n if (vs->mouse_mode_notifier.notify != NULL) {\n@@ -2097,6 +2103,7 @@ static void send_ext_key_event_ack(VncState *vs)\n vnc_flush(vs);\n }\n \n+#ifdef CONFIG_AUDIO\n static void send_ext_audio_ack(VncState *vs)\n {\n vnc_lock_output(vs);\n@@ -2110,6 +2117,7 @@ static void send_ext_audio_ack(VncState *vs)\n vnc_unlock_output(vs);\n vnc_flush(vs);\n }\n+#endif\n \n static void send_xvp_message(VncState *vs, int code)\n {\n@@ -2197,10 +2205,15 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)\n send_ext_key_event_ack(vs);\n break;\n case VNC_ENCODING_AUDIO:\n+#ifdef CONFIG_AUDIO\n if (vs->vd->audio_be) {\n vnc_set_feature(vs, VNC_FEATURE_AUDIO);\n send_ext_audio_ack(vs);\n }\n+#else\n+ VNC_DEBUG(\"Audio encoding received with audio subsystem \"\n+ \"disabled\\n\");\n+#endif\n break;\n case VNC_ENCODING_WMVi:\n vnc_set_feature(vs, VNC_FEATURE_WMVI);\n@@ -2394,7 +2407,9 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)\n {\n int i;\n uint16_t limit;\n- uint32_t freq;\n+ #ifdef CONFIG_AUDIO\n+ uint32_t freq;\n+ #endif\n VncDisplay *vd = vs->vd;\n \n if (data[0] > 3) {\n@@ -2571,7 +2586,9 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)\n vnc_client_error(vs);\n break;\n }\n-\n+#ifndef CONFIG_AUDIO\n+ abort();\n+#else\n if (len == 2)\n return 4;\n \n@@ -2626,7 +2643,7 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)\n break;\n }\n break;\n-\n+#endif\n default:\n VNC_DEBUG(\"Msg: %d\\n\", read_u16(data, 0));\n vnc_client_error(vs);\n@@ -3369,10 +3386,12 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,\n vs->last_x = -1;\n vs->last_y = -1;\n \n+#ifdef CONFIG_AUDIO\n vs->as.freq = 44100;\n vs->as.nchannels = 2;\n vs->as.fmt = AUDIO_FORMAT_S16;\n vs->as.endianness = 0;\n+#endif\n \n qemu_mutex_init(&vs->output_mutex);\n vs->bh = qemu_bh_new(vnc_jobs_bh, vs);\n@@ -3645,9 +3664,11 @@ static QemuOptsList qemu_vnc_opts = {\n },{\n .name = \"non-adaptive\",\n .type = QEMU_OPT_BOOL,\n+#ifdef CONFIG_AUDIO\n },{\n .name = \"audiodev\",\n .type = QEMU_OPT_STRING,\n+#endif\n },{\n .name = \"power-control\",\n .type = QEMU_OPT_BOOL,\n@@ -4080,7 +4101,9 @@ void vnc_display_open(const char *id, Error **errp)\n const char *saslauthz;\n int lock_key_sync = 1;\n int key_delay_ms;\n+#ifdef CONFIG_AUDIO\n const char *audiodev;\n+#endif\n const char *passwordSecret;\n \n if (!vd) {\n@@ -4238,6 +4261,7 @@ void vnc_display_open(const char *id, Error **errp)\n }\n vd->ledstate = 0;\n \n+#ifdef CONFIG_AUDIO\n audiodev = qemu_opt_get(opts, \"audiodev\");\n if (audiodev) {\n vd->audio_be = audio_be_by_name(audiodev, errp);\n@@ -4247,6 +4271,7 @@ void vnc_display_open(const char *id, Error **errp)\n } else {\n vd->audio_be = audio_get_default_audio_be(NULL);\n }\n+#endif\n \n device_id = qemu_opt_get(opts, \"display\");\n if (device_id) {\n","prefixes":["2/8"]}