f4f53a5098
- hw/nvme: Remove redundant dma_blk_write - tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution - edid: set default resolution to 1280x800 (WXGA) - iotests/308: Fix for CAP_DAC_OVERRIDE - hvf: remove unused but set variable - vvfat: Fix vvfat_write() for writes before the root directory - hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT() - hw/pci: Remove unused pci_irq_pulse() method - ui/gtk: fix leaks found wtih fuzzing - target/i386: fix size of EBP writeback in gen_enter() - tests/qtest/fuzz: fix memleak in qos_fuzz.c - hw/core/loader: gunzip(): fix memory leak on error path - migration: fix a typo - scsi: fetch unit attention when creating the request - raw-format: Fix error message for invalid offset/size - tcg: Reset data_gen_ptr correctly - Fix calculation of minimum in colo_compare_tcp - hw/intc: Don't clear pending bits on IRQ lowering - target/arm: Drop user-only special case in sve_stN_r - usb-hub: Fix handling port power control messages - target/ppc: Set ctx->opcode for decode_insn32() - linux-user: Add proper strace format strings for getdents()/getdents64() - linux-user: Fix TARGET_PROT_SEM for XTENSA - linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch - linux-user/hppa: Dump IIR on register dump - tests: Fix typo in check-help output - qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ - hw/scsi/megasas: Simplify using the ldst API - gqa-win: get_pci_info: Clean dev_info if handle is valid - target/ppc: Fix 7448 support - vvfat: Fix size of temporary qcow file - docs: Correct 'vhost-user-blk' spelling - jackaudio: use ifdefs to hide unavailable functions - simplebench: Fix Python syntax error (reported by LGTM) - python: update type hints for mypy 0.930 - Python/aqmp: fix type definitions for mypy 0.920 - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - hw/ppc/e500: Prefer QOM cast - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - linux-user: Show timespec on strace for futex() - linux-user: Add strace for clock_nanosleep() - linux-user: Fix strace of chmod() if mode == 0 - linux-user: Log failing executable in EXCP_DUMP() - linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 87ebac5b5cfb97ddb7ac2af097703758fb0751c4)
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From 00b7eee0e0116ec78b41db24da510e655ec28c4c Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 20 Nov 2024 11:08:20 +0800
|
|
Subject: [PATCH] jackaudio: use ifdefs to hide unavailable functions
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from commit ead789eb46a7df4eaab9e14e29e1d0d2a379988d
|
|
|
|
On Windows the jack_set_thread_creator() function and on MacOS the
|
|
pthread_setname_np() function with a thread pointer paramater is
|
|
not available. Use #ifdefs to remove the jack_set_thread_creator()
|
|
function call and the qjack_thread_creator() function in both
|
|
cases.
|
|
|
|
The qjack_thread_creator() function just sets the name of the
|
|
created thread for debugging purposes and isn't really necessary.
|
|
|
|
From the jack_set_thread_creator() documentation:
|
|
(...)
|
|
|
|
No normal application/client should consider calling this. (...)
|
|
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/785
|
|
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
|
|
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
|
|
Message-Id: <20211226154017.6067-1-vr_qemu@t-online.de>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
audio/jackaudio.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/audio/jackaudio.c b/audio/jackaudio.c
|
|
index e7de6d5433..317009e936 100644
|
|
--- a/audio/jackaudio.c
|
|
+++ b/audio/jackaudio.c
|
|
@@ -622,6 +622,7 @@ static void qjack_enable_in(HWVoiceIn *hw, bool enable)
|
|
ji->c.enabled = enable;
|
|
}
|
|
|
|
+#if !defined(WIN32) && defined(CONFIG_PTHREAD_SETNAME_NP_W_TID)
|
|
static int qjack_thread_creator(jack_native_thread_t *thread,
|
|
const pthread_attr_t *attr, void *(*function)(void *), void *arg)
|
|
{
|
|
@@ -635,6 +636,7 @@ static int qjack_thread_creator(jack_native_thread_t *thread,
|
|
|
|
return ret;
|
|
}
|
|
+#endif
|
|
|
|
static void *qjack_init(Audiodev *dev)
|
|
{
|
|
@@ -687,7 +689,9 @@ static void register_audio_jack(void)
|
|
{
|
|
qemu_mutex_init(&qjack_shutdown_lock);
|
|
audio_driver_register(&jack_driver);
|
|
+#if !defined(WIN32) && defined(CONFIG_PTHREAD_SETNAME_NP_W_TID)
|
|
jack_set_thread_creator(qjack_thread_creator);
|
|
+#endif
|
|
jack_set_error_function(qjack_error);
|
|
jack_set_info_function(qjack_info);
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|