From nobody Tue Nov 18 04:28:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1607864908; cv=none; d=zohomail.com; s=zohoarc; b=fslds7dq+01kP+MBmGFR3PE9EfXWRgmT6/gxpBrrM4PdxJ/7lKY2ZzLI4NUxlW8wWqH/D7tSBmb7j8PKrAcklkxWrXW3xFP7rei3dwvy4VfrsfzdGimEW0MkJ+aWt3m0y42KYgzNxlVoTAGju71z2VN0Lnqvbp9lbpcUcqU0nug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607864908; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+5SlByGTSB8WETlzBzr2MXcS5pXuMySteXduBZqBmAo=; b=J/0PRY6VoSFQDnftTtfUZpdiYBe0NR+NGol8603m117ca5ajzSrWPTClwB9ipx0NPKtJ2CUdCDqb9auRNUkJ3jISRQ/nqaH0F6dDr8WCcfdeSyCUzehSK4DZKSU83NTAtUHL3HHXD3unWXbFAjeKD0R3u9+KfmnPaZB5USi19GM= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607864908706997.4066432149132; Sun, 13 Dec 2020 05:08:28 -0800 (PST) Received: from localhost ([::1]:52224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koR6w-0007fl-9A for importer@patchew.org; Sun, 13 Dec 2020 08:08:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4J-0006bq-7g for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:43 -0500 Received: from mailout02.t-online.de ([194.25.134.17]:60556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4E-0000jw-SG for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:42 -0500 Received: from fwd00.aul.t-online.de (fwd00.aul.t-online.de [172.20.26.147]) by mailout02.t-online.de (Postfix) with SMTP id 3E17B41ACBBC; Sun, 13 Dec 2020 14:05:37 +0100 (CET) Received: from linpower.localnet (EqMuuyZfghrtOWu3ZDfGA0-nDjpg+7knaACgtqJ7Zl387cYtbBuX-t2TUo4OXxTQuS@[79.208.17.59]) by fwd00.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1koR49-0tR0IC0; Sun, 13 Dec 2020 14:05:33 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 1FFCD200621; Sun, 13 Dec 2020 14:05:28 +0100 (CET) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 3/4] coreaudio: always stop audio playback on shut down Date: Sun, 13 Dec 2020 14:05:27 +0100 Message-Id: <20201213130528.5863-3-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <1a970310-4cff-f2f7-985e-05b2f4cd446b@t-online.de> References: <1a970310-4cff-f2f7-985e-05b2f4cd446b@t-online.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: EqMuuyZfghrtOWu3ZDfGA0-nDjpg+7knaACgtqJ7Zl387cYtbBuX-t2TUo4OXxTQuS X-TOI-EXPURGATEID: 150726::1607864733-00010A86-B33264B6/0/0 CLEAN NORMAL X-TOI-MSGID: d9ecac1a-d898-4006-bc84-a637a36737aa 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: none client-ip=194.25.134.17; envelope-from=volker.ruemelin@t-online.de; helo=mailout02.t-online.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Always stop audio playback and remove the playback callback when QEMU exits. On shut down the function coreaudio_fini_out() destroys the coreaudio mutex but fails to stop audio playback and to remove the audio playback callback, because function audio_is_cleaning_up() always returns true when called from coreaudio_fini_out(). Now there is a time window from pthread_mutex_destroy() to program exit where Core Audio may call the audio playback callback which tries to lock the destroyed coreaudio mutex. This leads to the following error. coreaudio: Could not lock voice for audioDeviceIOProc Reason: Invalid argument This bug was reported on the qemu-discuss mailing list. https://lists.nongnu.org/archive/html/qemu-discuss/2020-10/msg00018.html Tested-by: Howard Spoelstra Signed-off-by: Volker R=C3=BCmelin --- audio/coreaudio.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index a5df950514..79a9d40bf8 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -593,22 +593,20 @@ static void coreaudio_fini_out (HWVoiceOut *hw) int err; coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; =20 - if (!audio_is_cleaning_up()) { - /* stop playback */ - if (isPlaying(core->outputDeviceID)) { - status =3D AudioDeviceStop(core->outputDeviceID, core->ioproci= d); - if (status !=3D kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not stop playback\n"); - } - } - - /* remove callback */ - status =3D AudioDeviceDestroyIOProcID(core->outputDeviceID, - core->ioprocid); + /* stop playback */ + if (isPlaying(core->outputDeviceID)) { + status =3D AudioDeviceStop(core->outputDeviceID, core->ioprocid); if (status !=3D kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not remove IOProc\n"); + coreaudio_logerr(status, "Could not stop playback\n"); } } + + /* remove callback */ + status =3D AudioDeviceDestroyIOProcID(core->outputDeviceID, + core->ioprocid); + if (status !=3D kAudioHardwareNoError) { + coreaudio_logerr(status, "Could not remove IOProc\n"); + } core->outputDeviceID =3D kAudioDeviceUnknown; =20 /* destroy mutex */ @@ -633,13 +631,11 @@ static void coreaudio_enable_out(HWVoiceOut *hw, bool= enable) } } else { /* stop playback */ - if (!audio_is_cleaning_up()) { - if (isPlaying(core->outputDeviceID)) { - status =3D AudioDeviceStop(core->outputDeviceID, - core->ioprocid); - if (status !=3D kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not pause playback\n"= ); - } + if (isPlaying(core->outputDeviceID)) { + status =3D AudioDeviceStop(core->outputDeviceID, + core->ioprocid); + if (status !=3D kAudioHardwareNoError) { + coreaudio_logerr(status, "Could not pause playback\n"); } } } --=20 2.26.2