From patchwork Sun Dec 13 13:05:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1415568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cv4h52xWWz9sTL for ; Mon, 14 Dec 2020 00:12:53 +1100 (AEDT) Received: from localhost ([::1]:57902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koRBD-0001rv-7M for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2020 08:12:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4K-0006dH-VT for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:45 -0500 Received: from mailout02.t-online.de ([194.25.134.17]:60594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4J-0000kd-8l for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:44 -0500 Received: from fwd22.aul.t-online.de (fwd22.aul.t-online.de [172.20.26.127]) by mailout02.t-online.de (Postfix) with SMTP id 0C61741ACBBB; Sun, 13 Dec 2020 14:05:42 +0100 (CET) Received: from linpower.localnet (XHx-iUZcQhImH72qu4KMlIHpfvJ1jx1JfExGo3K59L3bC8R6pjNGJ9XD-slSAmdg0Y@[79.208.17.59]) by fwd22.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1koR44-1dDeAC0; Sun, 13 Dec 2020 14:05:28 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 1D01E200451; Sun, 13 Dec 2020 14:05:28 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 1/4] coreaudio: rename misnamed variable fake_as Date: Sun, 13 Dec 2020 14:05:25 +0100 Message-Id: <20201213130528.5863-1-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 X-ID: XHx-iUZcQhImH72qu4KMlIHpfvJ1jx1JfExGo3K59L3bC8R6pjNGJ9XD-slSAmdg0Y X-TOI-EXPURGATEID: 150726::1607864728-00011FFC-E437F583/0/0 CLEAN NORMAL X-TOI-MSGID: 0af5992c-e5d9-401f-a276-1040dd383152 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While the variable once was used to fake audio settings, since commit ed2a4a7941 "audio: proper support for float samples in mixeng" this is no longer true. Rename the variable to obt_as. This is the same naming scheme as in audio/sdlaudio.c Tested-by: Howard Spoelstra Signed-off-by: Volker Rümelin --- audio/coreaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 4b4365660f..0ee85052c4 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -482,7 +482,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, Audiodev *dev = drv_opaque; AudiodevCoreaudioPerDirectionOptions *cpdo = dev->u.coreaudio.out; int frames; - struct audsettings fake_as; + struct audsettings obt_as; /* create mutex */ err = pthread_mutex_init(&core->mutex, NULL); @@ -491,8 +491,8 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, return -1; } - fake_as = *as; - as = &fake_as; + obt_as = *as; + as = &obt_as; as->fmt = AUDIO_FORMAT_F32; audio_pcm_init_info (&hw->info, as); From patchwork Sun Dec 13 13:05:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1415566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cv4Zz3gWkz9sTL for ; Mon, 14 Dec 2020 00:08:27 +1100 (AEDT) Received: from localhost ([::1]:51882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koR6v-0007Wz-Gx for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2020 08:08:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4J-0006cS-Nq for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:43 -0500 Received: from mailout02.t-online.de ([194.25.134.17]:60508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4C-0000jo-Fi for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:43 -0500 Received: from fwd34.aul.t-online.de (fwd34.aul.t-online.de [172.20.26.145]) by mailout02.t-online.de (Postfix) with SMTP id A558B41ACBB7; Sun, 13 Dec 2020 14:05:32 +0100 (CET) Received: from linpower.localnet (TF5WLkZawhW1i+siDZ1kBkNHL2e4i2pPW5Vbs-7Meqmc+TvNrgFjfraAWbX4sD5w2o@[79.208.17.59]) by fwd34.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1koR47-1463rk0; Sun, 13 Dec 2020 14:05:31 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 1F05D200617; Sun, 13 Dec 2020 14:05:28 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 2/4] coreaudio: don't start playback in init routine Date: Sun, 13 Dec 2020 14:05:26 +0100 Message-Id: <20201213130528.5863-2-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 X-ID: TF5WLkZawhW1i+siDZ1kBkNHL2e4i2pPW5Vbs-7Meqmc+TvNrgFjfraAWbX4sD5w2o X-TOI-EXPURGATEID: 150726::1607864731-000171DC-E4377A34/0/0 CLEAN NORMAL X-TOI-MSGID: bc1e07b5-2eff-4f12-9148-cff2c6586f19 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Every emulated audio device has a way to enable audio playback. Don't start playback until the guest enables the audio device to keep the Core Audio device run state in sync with hw->enabled. Tested-by: Howard Spoelstra Signed-off-by: Volker Rümelin --- audio/coreaudio.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 0ee85052c4..a5df950514 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -584,17 +584,6 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, return -1; } - /* start Playback */ - if (!isPlaying(core->outputDeviceID)) { - status = AudioDeviceStart(core->outputDeviceID, core->ioprocid); - if (status != kAudioHardwareNoError) { - coreaudio_logerr2 (status, typ, "Could not start playback\n"); - AudioDeviceDestroyIOProcID(core->outputDeviceID, core->ioprocid); - core->outputDeviceID = kAudioDeviceUnknown; - return -1; - } - } - return 0; } From patchwork Sun Dec 13 13:05:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1415565 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cv4Yc59Bxz9sTL for ; Mon, 14 Dec 2020 00:07:16 +1100 (AEDT) Received: from localhost ([::1]:50162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koR5m-0006dP-PE for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2020 08:07:14 -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_R=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 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: 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+incoming=patchwork.ozlabs.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ümelin --- 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 = (coreaudioVoiceOut *) hw; - if (!audio_is_cleaning_up()) { - /* stop playback */ - if (isPlaying(core->outputDeviceID)) { - status = AudioDeviceStop(core->outputDeviceID, core->ioprocid); - if (status != kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not stop playback\n"); - } - } - - /* remove callback */ - status = AudioDeviceDestroyIOProcID(core->outputDeviceID, - core->ioprocid); + /* stop playback */ + if (isPlaying(core->outputDeviceID)) { + status = AudioDeviceStop(core->outputDeviceID, core->ioprocid); if (status != kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not remove IOProc\n"); + coreaudio_logerr(status, "Could not stop playback\n"); } } + + /* remove callback */ + status = AudioDeviceDestroyIOProcID(core->outputDeviceID, + core->ioprocid); + if (status != kAudioHardwareNoError) { + coreaudio_logerr(status, "Could not remove IOProc\n"); + } core->outputDeviceID = kAudioDeviceUnknown; /* 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 = AudioDeviceStop(core->outputDeviceID, - core->ioprocid); - if (status != kAudioHardwareNoError) { - coreaudio_logerr (status, "Could not pause playback\n"); - } + if (isPlaying(core->outputDeviceID)) { + status = AudioDeviceStop(core->outputDeviceID, + core->ioprocid); + if (status != kAudioHardwareNoError) { + coreaudio_logerr(status, "Could not pause playback\n"); } } } From patchwork Sun Dec 13 13:05:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1415567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cv4dK3Zbvz9sVY for ; Mon, 14 Dec 2020 00:10:28 +1100 (AEDT) Received: from localhost ([::1]:54486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koR8s-0000EM-0l for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2020 08:10:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4K-0006ct-6W for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:44 -0500 Received: from mailout11.t-online.de ([194.25.134.85]:58914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koR4F-0000jx-5P for qemu-devel@nongnu.org; Sun, 13 Dec 2020 08:05:43 -0500 Received: from fwd23.aul.t-online.de (fwd23.aul.t-online.de [172.20.26.128]) by mailout11.t-online.de (Postfix) with SMTP id 76EAA42229D8; Sun, 13 Dec 2020 14:05:37 +0100 (CET) Received: from linpower.localnet (XKnOyeZSYh+WU4gWoIYlY58ntX8OdE8NCAiTLe0-uKiSxJNvrtxFAGJh+MdYWDlgkS@[79.208.17.59]) by fwd23.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1koR4C-0NfIy80; Sun, 13 Dec 2020 14:05:36 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 2253E200625; Sun, 13 Dec 2020 14:05:28 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 4/4] audio: remove unused function audio_is_cleaning_up() Date: Sun, 13 Dec 2020 14:05:28 +0100 Message-Id: <20201213130528.5863-4-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 X-ID: XKnOyeZSYh+WU4gWoIYlY58ntX8OdE8NCAiTLe0-uKiSxJNvrtxFAGJh+MdYWDlgkS X-TOI-EXPURGATEID: 150726::1607864736-00017F06-4C10CF18/0/0 CLEAN NORMAL X-TOI-MSGID: 5afa17a4-9fc0-4b39-bad4-2b54fee62e50 Received-SPF: none client-ip=194.25.134.85; envelope-from=volker.ruemelin@t-online.de; helo=mailout11.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_H2=-0.001, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The previous commit removed the last call site of audio_is_cleaning_up(). Remove the now unused function. Tested-by: Howard Spoelstra Signed-off-by: Volker Rümelin --- audio/audio.c | 8 -------- audio/audio.h | 1 - 2 files changed, 9 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 46578e4a58..a213409270 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1588,13 +1588,6 @@ static void audio_vm_change_state_handler (void *opaque, int running, audio_reset_timer (s); } -static bool is_cleaning_up; - -bool audio_is_cleaning_up(void) -{ - return is_cleaning_up; -} - static void free_audio_state(AudioState *s) { HWVoiceOut *hwo, *hwon; @@ -1647,7 +1640,6 @@ static void free_audio_state(AudioState *s) void audio_cleanup(void) { - is_cleaning_up = true; while (!QTAILQ_EMPTY(&audio_states)) { AudioState *s = QTAILQ_FIRST(&audio_states); QTAILQ_REMOVE(&audio_states, s, list); diff --git a/audio/audio.h b/audio/audio.h index b883ebfb1f..41b3ef04ea 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -160,7 +160,6 @@ static inline void *advance (void *p, int incr) int wav_start_capture(AudioState *state, CaptureState *s, const char *path, int freq, int bits, int nchannels); -bool audio_is_cleaning_up(void); void audio_cleanup(void); void audio_sample_to_uint64(const void *samples, int pos,