From c867f21d7f49830e9243ef5bff35e45face18a49 Mon Sep 17 00:00:00 2001 Message-ID: From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 5 Nov 2024 12:32:03 +0400 Subject: [PATCH] hw/audio/hda: avoid unnecessary re-open stream on reconfiguration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-type: text/plain Closing and opening a stream too quickly during reconfiguration create issues with Spice. Note: the issue with Spice has been there before and still is. When the audio stream is recreated, for example when using `out.mixing-engine=false`. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2639 Fixes: 6d6e23361f ("hw/audio/hda: fix memory leak on audio setup") Signed-off-by: Marc-André Lureau Signed-off-by: Cole Robinson --- hw/audio/hda-codec.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 4373565371..b3075b5d44 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -502,7 +502,15 @@ static void hda_audio_setup(HDAAudioStream *st) trace_hda_audio_format(st->node->name, st->as.nchannels, fmt2name[st->as.fmt], st->as.freq); - hda_close_stream(st->state, st); + /* + * Do not hda_close_stream(st->state, st), AUD_open_() handles the logic for + * fixed_settings, and same format. This helps prevent race issues in Spice + * server & client code too. (see #2639) + */ + if (use_timer) { + timer_free(st->buft); + st->buft = NULL; + } if (st->output) { if (use_timer) { cb = hda_audio_output_cb; -- 2.46.2