5636aff5b1
- target/i386: csv: Support inject secret for CSV3 guest only if the extension is enabled
- target/i386: csv: Support load kernel hashes for CSV3 guest only if the extension is enabled
- target/i386: csv: Request to set private memory of CSV3 guest if the extension is enabled
- target/i386: kvm: Support to get and enable extensions for Hygon CoCo guest
- qapi/qom,target/i386: csv-guest: Introduce secret-header-file=str and secret-file=str options
- bakcend: VirtCCA:resolve hugepage memory waste issue in vhost-user scenario
- parallels: fix ext_off assertion failure due to overflow
- backends/cryptodev-vhost-user: Fix local_error leaks
- hw/usb/hcd-ehci: Fix debug printf format string
- target/riscv/vector_helper.c: fix 'vmvr_v' memcpy endianess
- target/riscv/vector_helper.c: optimize loops in ldst helpers
- target/riscv/vector_helper.c: set vstart = 0 in GEN_VEXT_VSLIDEUP_VX()
- target/hexagon: don't look for static glib
- virtio-net: Fix network stall at the host side waiting for kick
- Add if condition to avoid assertion failed error in blockdev_init
- target/arm: Use float_status copy in sme_fmopa_s
- target/arm: take HSTR traps of cp15 accesses to EL2, not EL1
- target/arm: Reinstate "vfp" property on AArch32 CPUs
- target/i386/cpu: Fix notes for CPU models
- target/arm: LDAPR should honour SCTLR_ELx.nAA
- target/riscv: Avoid bad shift in riscv_cpu_do_interrupt()
- hvf: remove unused but set variable
- hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT()
- Avoid taking address of out-of-bounds array index
- target/arm: Fix VCMLA Dd, Dn, Dm[idx]
- target/arm: Fix UMOPA/UMOPS of 16-bit values
- target/arm: Fix SVE/SME gross MTE suppression checks
- target/arm: Fix nregs computation in do_{ld,st}_zpa
- crypto: fix error check on gcry_md_open
- Change vmstate_cpuhp_sts vmstateDescription version_id
- hw/pci: Remove unused pci_irq_pulse() method
- hw/intc: Don't clear pending bits on IRQ lowering
- target/arm: Drop user-only special case in sve_stN_r
- migration: Ensure vmstate_save() sets errp
- target/i386: fix hang when using slow path for ptw_setl
- contrib/plugins: add compat for g_memdup2
- hw/audio/hda: fix memory leak on audio setup
- crypto: perform runtime check for hash/hmac support in gcrypt
- target/arm: Fix incorrect aa64_tidcp1 feature check
- target/arm: fix exception syndrome for AArch32 bkpt insn
- target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU
- linux-user: Print tid not pid with strace
- target/arm: Fix A64 scalar SQSHRN and SQRSHRN
- target/arm: Don't assert for 128-bit tile accesses when SVL is 128
- hw/timer/exynos4210_mct: fix possible int overflow
- target/arm: Avoid shifts by -1 in tszimm_shr() and tszimm_shl()
- hw/audio/virtio-snd: Always use little endian audio format
- target/riscv: Fix vcompress with rvv_ta_all_1s
- usb-hub: Fix handling port power control messages
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit d4a20b24ff377fd07fcbf2b72eecaf07a3ac4cc0)
86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
From ecca2052693cc2a91459ac418bface2f1e635c88 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Thu, 14 Nov 2024 13:53:18 +0100
|
|
Subject: [PATCH] hw/audio/hda: fix memory leak on audio setup
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When SET_STREAM_FORMAT is called, the st->buft timer is overwritten, thus
|
|
causing a memory leak. This was originally fixed in commit 816139ae6a5
|
|
("hw/audio/hda: fix memory leak on audio setup", 2024-11-14) but that
|
|
caused the audio to break in SPICE.
|
|
|
|
Fortunately, a simpler fix is possible. The timer only needs to be
|
|
reset, because the callback is always the same (st->output is set at
|
|
realize time in hda_audio_init); call to timer_new_ns overkill. Replace
|
|
it with timer_del and only initialize the timer once; for simplicity,
|
|
do it even if use_timer is false.
|
|
|
|
An even simpler fix would be to free the old time in hda_audio_setup().
|
|
However, it seems better to place the initialization of the timer close
|
|
to that of st->ouput.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Message-ID: <20241114125318.1707590-3-pbonzini@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
(cherry picked from commit 626b39006d2f9b1378a04cb88a2187bb852cb055)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/audio/hda-codec.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
|
|
index 19f401cabe..ac908e56c6 100644
|
|
--- a/hw/audio/hda-codec.c
|
|
+++ b/hw/audio/hda-codec.c
|
|
@@ -487,8 +487,7 @@ static void hda_audio_setup(HDAAudioStream *st)
|
|
if (st->output) {
|
|
if (use_timer) {
|
|
cb = hda_audio_output_cb;
|
|
- st->buft = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
|
- hda_audio_output_timer, st);
|
|
+ timer_del(st->buft);
|
|
} else {
|
|
cb = hda_audio_compat_output_cb;
|
|
}
|
|
@@ -497,8 +496,7 @@ static void hda_audio_setup(HDAAudioStream *st)
|
|
} else {
|
|
if (use_timer) {
|
|
cb = hda_audio_input_cb;
|
|
- st->buft = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
|
- hda_audio_input_timer, st);
|
|
+ timer_del(st->buft);
|
|
} else {
|
|
cb = hda_audio_compat_input_cb;
|
|
}
|
|
@@ -726,8 +724,12 @@ static void hda_audio_init(HDACodecDevice *hda,
|
|
st->gain_right = QEMU_HDA_AMP_STEPS;
|
|
st->compat_bpos = sizeof(st->compat_buf);
|
|
st->output = true;
|
|
+ st->buft = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
|
+ hda_audio_output_timer, st);
|
|
} else {
|
|
st->output = false;
|
|
+ st->buft = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
|
+ hda_audio_input_timer, st);
|
|
}
|
|
st->format = AC_FMT_TYPE_PCM | AC_FMT_BITS_16 |
|
|
(1 << AC_FMT_CHAN_SHIFT);
|
|
@@ -750,9 +752,7 @@ static void hda_audio_exit(HDACodecDevice *hda)
|
|
if (st->node == NULL) {
|
|
continue;
|
|
}
|
|
- if (a->use_timer) {
|
|
- timer_free(st->buft);
|
|
- }
|
|
+ timer_free(st->buft);
|
|
if (st->output) {
|
|
AUD_close_out(&a->card, st->voice.out);
|
|
} else {
|
|
--
|
|
2.41.0.windows.1
|
|
|