From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040219; cv=none; d=zohomail.com; s=zohoarc; b=Ns0RAEimTrMjJTsKR1zrQGsCzRhK/PATCJAGfI69xioI0ObhXziMfHv34vZC9LgrbqqPsg6FlXDly4lVJxB7CT2eVEDyS+N/8Yzq7Wbtis2O9d9AqXPEgke3o2zytA+aF6mcKYZDd1TO7LPN2ZKTBZQuFIK0wbwuG2R6Wwjv59A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040219; 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=fI+QQ7FwNszPqBHjqQsEhWeJnnkFBxwInWIoU5Mf4/E=; b=ii70fa9iuwzxe7d+gLFMI1zK4KQcFiwxQ189z1ScVGQvw4UjkhC+iEyWAd6n/oCvSZFpXiLUGZOsHEVToCAAkGsMPwHY4Xbxp5IrnGq4CPBJ0g3OUblfFQC0CHNEKPqS1GT+r9z5a42sWU5tQlJxGkUTOP8/anJP4fcXgWdpTRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608040218927659.6824539620964; Tue, 15 Dec 2020 05:50:18 -0800 (PST) Received: from localhost ([::1]:56542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAiS-00010s-Tg for importer@patchew.org; Tue, 15 Dec 2020 08:50:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgt-0008F3-C3 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgr-0007FB-3B for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-n3GZ-jdRN0KAJN7ksUV5QQ-1; Tue, 15 Dec 2020 08:48:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1BA5801B14; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7517419C44; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8A1AAA1EE; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fI+QQ7FwNszPqBHjqQsEhWeJnnkFBxwInWIoU5Mf4/E=; b=PAUttBSFE/AxIJ8pSq6FygBpYdM39YZHGUjwxoEo+19JsPvykq9uPNcJCw3631te8nDkwM kdSyUE5DZ+HdQLNxnNLbf95jSol7u3keQMmmCsehIQRC5bgwHj0+vIznq63A4vfgml8zqL 9B9pl7UYhiyRKIgx5BdoChbYR/G2Dcg= X-MC-Unique: n3GZ-jdRN0KAJN7ksUV5QQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/7] coreaudio: rename misnamed variable fake_as Date: Tue, 15 Dec 2020 14:48:20 +0100 Message-Id: <20201215134826.5504-2-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann , Howard Spoelstra Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin 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=C3=BCmelin Message-id: 20201213130528.5863-1-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/coreaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 4b4365660fcf..0ee85052c452 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -482,7 +482,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct au= dsettings *as, Audiodev *dev =3D drv_opaque; AudiodevCoreaudioPerDirectionOptions *cpdo =3D dev->u.coreaudio.out; int frames; - struct audsettings fake_as; + struct audsettings obt_as; =20 /* create mutex */ err =3D pthread_mutex_init(&core->mutex, NULL); @@ -491,8 +491,8 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct au= dsettings *as, return -1; } =20 - fake_as =3D *as; - as =3D &fake_as; + obt_as =3D *as; + as =3D &obt_as; as->fmt =3D AUDIO_FORMAT_F32; audio_pcm_init_info (&hw->info, as); =20 --=20 2.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040340; cv=none; d=zohomail.com; s=zohoarc; b=d03VDxWYAnl5tcJyHNoKhqDLZdmYVQOQkMqBgvwr4E1PQ0rx8MLLTp6mLYemB6FRu+bXLCah8w4orxd39P/NPbo2J0wJnwuMccLVXlGGlezWJoSw94NS2q8EBdAnDce4y9mM//rovYE6jhKqtD+5evfWQqVwPLy8Tr8qwlPvGGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040340; 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=2i5E2aMgyCmnQfmI0UAKgktFVRzDTR2PAMZBjgmJBJk=; b=IMq221HiyD6ZaB+rVST8I/1nK/MqvYhJiFSKqJ8C1Z6bmlBokKh050ApzIJr7jTguNyTA5VfRRXII5S3hPOfOwRuM3UwPpb55+CPgChkuwlQFlJqfxUP0ukt9Dk8CnQ5K9RyVgUV+++DvGU56QQBqs8M4QpHFuaWoRI3S9rZzGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608040340539714.8469997505606; Tue, 15 Dec 2020 05:52:20 -0800 (PST) Received: from localhost ([::1]:34980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAkV-0003mz-AK for importer@patchew.org; Tue, 15 Dec 2020 08:52:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgv-0008GU-Qa for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgs-0007H4-V8 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-145-TXn9fn8iOj2277byIvln1A-1; Tue, 15 Dec 2020 08:48:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0506418C8C0C; Tue, 15 Dec 2020 13:48:31 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75C0160854; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 932C9A1FB; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2i5E2aMgyCmnQfmI0UAKgktFVRzDTR2PAMZBjgmJBJk=; b=iLhuK6UlZ0nihg1Ptz7I0GHaMvvm68e1R7Ao0gfKSLQhJfmL7kxaXQbFlppeQFE0GagIRa aI/zDlOrpproJUVsWUhsoFRkbM61PX32sj1dx3ikEP8Du1tVIR0YvZi1wZQ7yBeXUA6Epc jZADDYT4F68ItF6OerztVxI1mE8cYbI= X-MC-Unique: TXn9fn8iOj2277byIvln1A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/7] coreaudio: don't start playback in init routine Date: Tue, 15 Dec 2020 14:48:21 +0100 Message-Id: <20201215134826.5504-3-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann , Howard Spoelstra Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin 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=C3=BCmelin Message-id: 20201213130528.5863-2-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/coreaudio.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 0ee85052c452..a5df95051461 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -584,17 +584,6 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct a= udsettings *as, return -1; } =20 - /* start Playback */ - if (!isPlaying(core->outputDeviceID)) { - status =3D AudioDeviceStart(core->outputDeviceID, core->ioprocid); - if (status !=3D kAudioHardwareNoError) { - coreaudio_logerr2 (status, typ, "Could not start playback\n"); - AudioDeviceDestroyIOProcID(core->outputDeviceID, core->ioproci= d); - core->outputDeviceID =3D kAudioDeviceUnknown; - return -1; - } - } - return 0; } =20 --=20 2.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040472; cv=none; d=zohomail.com; s=zohoarc; b=UbHwjn0jYsxa2CY1qnIj+mlJ9Cw09KvUPHkBpwmxStqzsFQ0r5PQFxummiIjtrJQMRpfw+zXGSC/RBqRpVK3mKcryWW+O1MjMCqaceLHxm1xnC57qpnvQu9qYyFkTb2vMoO2MZ2uUT25wal8rAfaPImCiJ8EKrQMDb1oX35s+jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040472; 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=Ey0Ay5MzC8zOj8mP1Wnup07FxCr1+p8UEYJnMwWIqTU=; b=lA1Nt1A3DeCY44yEDaJB8ZCtPe0cVOE3rzRFvxnb5TKUcKhkuxboiH+6kDPbAIWTmgaM/bGX2gUK7Wayh8PiK0la+bxUPcvRbj1mDbo1G0OEJDmZRJsKdDmObwp+8nW1youY9zo2UwTDYEoh/A0YzmLK0986ZQ+7Te+/Of2oFpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608040472370253.55501251149633; Tue, 15 Dec 2020 05:54:32 -0800 (PST) Received: from localhost ([::1]:41412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAmd-0006T3-By for importer@patchew.org; Tue, 15 Dec 2020 08:54:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgx-0008IJ-R0 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgr-0007G4-4w for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-mX8Kn3BwMoC5qcsHT6hzzg-1; Tue, 15 Dec 2020 08:48:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01AE3107ACE4; Tue, 15 Dec 2020 13:48:28 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78B5819C47; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9C78D9D92; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ey0Ay5MzC8zOj8mP1Wnup07FxCr1+p8UEYJnMwWIqTU=; b=WYBHA8WF/RA/RFy8rLKvPqSPT5xdL01J/xdbAwrJKFUKAunvUaSALeS0IbK6T8lu20oye7 fW0tsUjGU25pVcev7SnZyRjKZg0h3mjShJDav+I9mrui/QdHFTfmQ83GjtUKKxINsvSTvG vt0OV3wJhg6S6ubHqlthAv76IosuDD0= X-MC-Unique: mX8Kn3BwMoC5qcsHT6hzzg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/7] coreaudio: always stop audio playback on shut down Date: Tue, 15 Dec 2020 14:48:22 +0100 Message-Id: <20201215134826.5504-4-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann , Howard Spoelstra Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin 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 Message-id: 20201213130528.5863-3-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/coreaudio.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index a5df95051461..79a9d40bf8ef 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.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040218; cv=none; d=zohomail.com; s=zohoarc; b=iX0CRyFLKXqEeGVpG8aZJpW2Id2qHQ/vkJiOJFNE+hS6fS+36uoBe3tU+Qgx0P2MqxHXo34u6NkpeCjawkODsBMZtLgob8qPyptTm+niVWWW8BnMLBiOLwaRY5hpn8V7paaQ+YeIKRceUk5QnY20M7oOTBrdyEYdURzPN2qfvwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040218; 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=DuLkplo5t37rXxGgxXzT8WIWZid5j+FrkR/NEO57R28=; b=lo+6mJn9G7mWzilvDPYboT6gHPkmATZYgOnCg7cz5CjwD5OOInUNxva8UtTPKw+qLPANvlxgd0qOXvFw0XcBA7dJTWgc9VEBcMVX0hQYUfBZYaN31LJDiHu0PbSXFuEvpAFLGcHR5Bo2TaXJ2OnCAen6ykPDIVLqM5UtBVQjhVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608040218241466.479798495732; Tue, 15 Dec 2020 05:50:18 -0800 (PST) Received: from localhost ([::1]:56842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAiW-000180-Rx for importer@patchew.org; Tue, 15 Dec 2020 08:50:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgu-0008FB-7t for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgr-0007Ft-3H for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-450-uQVPioKBOpesUOj8iP0whQ-1; Tue, 15 Dec 2020 08:48:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD7E9107ACE3; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79C3419C66; Tue, 15 Dec 2020 13:48:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A70E89D99; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DuLkplo5t37rXxGgxXzT8WIWZid5j+FrkR/NEO57R28=; b=UEh/bTr63domQFJ4EX50vPGGO/uOlUBUhMseCbJucUh81dnAZ0sjnOAJP+hCEnqN/Q0rG4 eb+eZd7mFde1SccVj8v1izSDg9KzpvmZ8Eb21pAoET6xiF+MW3ASNCHeWk75i6dR/qqgLy OyMzlXMDDyS1YiGCTp7r1PrQZr9i5IQ= X-MC-Unique: uQVPioKBOpesUOj8iP0whQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/7] audio: remove unused function audio_is_cleaning_up() Date: Tue, 15 Dec 2020 14:48:23 +0100 Message-Id: <20201215134826.5504-5-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann , Howard Spoelstra Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin 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=C3=BCmelin Message-id: 20201213130528.5863-4-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/audio.h | 1 - audio/audio.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/audio/audio.h b/audio/audio.h index b883ebfb1f8e..41b3ef04eae1 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); =20 -bool audio_is_cleaning_up(void); void audio_cleanup(void); =20 void audio_sample_to_uint64(const void *samples, int pos, diff --git a/audio/audio.c b/audio/audio.c index 46578e4a583b..a21340927033 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1588,13 +1588,6 @@ static void audio_vm_change_state_handler (void *opa= que, int running, audio_reset_timer (s); } =20 -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) =20 void audio_cleanup(void) { - is_cleaning_up =3D true; while (!QTAILQ_EMPTY(&audio_states)) { AudioState *s =3D QTAILQ_FIRST(&audio_states); QTAILQ_REMOVE(&audio_states, s, list); --=20 2.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040339; cv=none; d=zohomail.com; s=zohoarc; b=Iv8cE3ONRsxSabqoCglEdC4LWm/uqxHW7BDYapnbs0UVSbt8kA49pjKeBWC5XJq1D8KNoNo/Z2XAkSVt6XkOe02XFPuImN+8tyJF6fGSljeFSJIHnfuoDtS1jcyDJfgCzOYVyh7mGJCL7Tuev9SXWAotJ6Im+xTjPJuN6yNs/kg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040339; 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=tnFp4mvBEfl1hzYle8wjhfM0GH2mdsC38C/9Z5PtH0I=; b=fnrURLKKTsJ58Nb4ED0P0J4rxZMFDewl3fzhtHMlJEktxv1Zv2E8+llfIsEad76T1c6FdozWwAKWkicTR1JLQfO8SZrbdqB5MP9PVWB1N+sa10dOuCib9feiN5Nc9gPFYpY2bpdxQsXvhJpcx0T4cAZGatqM/rRZKvLwnOEiK4s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160804033916198.75455236465666; Tue, 15 Dec 2020 05:52:19 -0800 (PST) Received: from localhost ([::1]:34876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAkU-0003kI-0i for importer@patchew.org; Tue, 15 Dec 2020 08:52:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgx-0008IB-Pf for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgv-0007HR-8E for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-ZUbPn5jvMsGPafvqV49UsA-1; Tue, 15 Dec 2020 08:48:34 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0AFC18C8C01 for ; Tue, 15 Dec 2020 13:48:33 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E29D6267A; Tue, 15 Dec 2020 13:48:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B01629D9B; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tnFp4mvBEfl1hzYle8wjhfM0GH2mdsC38C/9Z5PtH0I=; b=AQEgkSWfzR9LfQMmt21eoQpCzgYKZ5og6Ednl10Uy/fVvsS3IgZ4tlm7rEAr+H33La7Y/O /fdMF4V0+wRXC4jGS4FotmoYXip9O0qPQVkHOQV2UVdEHTKM7n5APDPnBpiu+EgHnvCcx/ pFZ1sQ+msT8PzfRyVekKaklZwvPEG/Y= X-MC-Unique: ZUbPn5jvMsGPafvqV49UsA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/7] cs4231: Get rid of empty property array Date: Tue, 15 Dec 2020 14:48:24 +0100 Message-Id: <20201215134826.5504-6-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Eduardo Habkost An empty props array is unnecessary, we can just not call device_class_set_props(). Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Eduardo Habkost Message-id: 20201211220529.2290218-2-ehabkost@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/cs4231.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 8e9554ce9bcd..209c05a0a0d5 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -160,17 +160,12 @@ static void cs4231_init(Object *obj) sysbus_init_irq(dev, &s->irq); } =20 -static Property cs4231_properties[] =3D { - {.name =3D NULL}, -}; - static void cs4231_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->reset =3D cs_reset; dc->vmsd =3D &vmstate_cs4231; - device_class_set_props(dc, cs4231_properties); } =20 static const TypeInfo cs4231_info =3D { --=20 2.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608046148; cv=none; d=zohomail.com; s=zohoarc; b=lHrUm4PTQwjFANOvWddd6be8FBpKPZQobqFYxuyo2wn5qFVwE2PynOlVfJO52PdFIwI5Z7koQnioXDIsKxUi5YOxNHhe5ApPYm5+DJxku/JfMZVnBBI/xYf/4yCdMNvoH+gW9kaOvgu7rhRTouqRDC+eYBxnwkCS38RfsfYh440= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608046148; 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=OGkz30TH9slFy1KJ3peEryg0Ol9LvAKDwVMRM/P3o0k=; b=cHNmGl5xb0KWpfBp+6PIT5zBo8B4mB/KI7W67nsvfpF7F5sfuqZJ5pzMk8H7n2lbGiDBays7Vaz8pAq9bR5FCbWNB/BAbhLowYnF5ty+F4RoUXv29WbOQu/u/T45iTC28wNpekUqX/Bch0X/YeaY2nCeCj6vbOLF+rOIR4w1t4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608046147997161.14804419687664; Tue, 15 Dec 2020 07:29:07 -0800 (PST) Received: from localhost ([::1]:45336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAoD-00089j-6e for importer@patchew.org; Tue, 15 Dec 2020 08:56:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAh1-0008QN-47 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgz-0007Il-Ga for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:42 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-5Jf_s5oqMvqZwzHwoMViQA-1; Tue, 15 Dec 2020 08:48:36 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 904ED107ACE4; Tue, 15 Dec 2020 13:48:35 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id B425B19C44; Tue, 15 Dec 2020 13:48:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B908B9D9C; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OGkz30TH9slFy1KJ3peEryg0Ol9LvAKDwVMRM/P3o0k=; b=MCCbDs978xVtX1BQ1JuFiB4CcXkP6XhPFU3FgrUTX7ztBihVsmTkeu2sOjVbAj2ACML6k1 IK9WhOhLyxqtFGzT5kLrJiY4sbKjL7p6RxO7SrpHYZ/1mB4F0fEjzIte7JrazEmzIf+jR3 rjXNqXJpmbapqYNNGGzODQl9qI104sc= X-MC-Unique: 5Jf_s5oqMvqZwzHwoMViQA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 6/7] audio: Simplify audio_bug() removing old code Date: Tue, 15 Dec 2020 14:48:25 +0100 Message-Id: <20201215134826.5504-7-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This code (introduced in commit 1d14ffa97ea, Oct 2005) is likely unused since years. Time to remove it. If the condition is true, simply call abort(). Suggested-by: Gerd Hoffmann Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20201210223506.263709-1-philmd@redhat.com Signed-off-by: Gerd Hoffmann --- audio/audio.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index a21340927033..0fdb808d6a57 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -104,9 +104,6 @@ const struct mixeng_volume nominal_volume =3D { =20 static bool legacy_config =3D true; =20 -#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED -#error No its not -#else int audio_bug (const char *funcname, int cond) { if (cond) { @@ -119,25 +116,11 @@ int audio_bug (const char *funcname, int cond) AUD_log (NULL, "I am sorry\n"); } AUD_log (NULL, "Context:\n"); - -#if defined AUDIO_BREAKPOINT_ON_BUG -# if defined HOST_I386 -# if defined __GNUC__ - __asm__ ("int3"); -# elif defined _MSC_VER - _asm _emit 0xcc; -# else - abort (); -# endif -# else - abort (); -# endif -#endif + abort(); } =20 return cond; } -#endif =20 static inline int audio_bits_to_index (int bits) { --=20 2.27.0 From nobody Tue Nov 18 05:50:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608040330; cv=none; d=zohomail.com; s=zohoarc; b=JNKzZtPazFuUJHHQQi90gwAGQTY1diKhPN7IvAwrY+rW0L815tAkAhtoQLmS0FgqP2chVkL/mb/ZDQD5e6jh7x3vDAUL2Qv3/EL3zLJRT7lA/NiZ2bcqd+77RYMrwJcntB3Ppwjokwz4hjuAUTMjKpXYKRUp5yS1+ibUFHQSzck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608040330; 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=Cu4gV/dipbPIP+N6xRJLWM5eaWb2SoyMOdSGji2ylcI=; b=KXx3gGASNL5benCnBXqQ7u/vx+GfUTNW42ARRKhD/haUxepfZ+lST85mA16dtKGd8Ygqp9+QAo51SXAfxWq9BTNyW1CgMZv3dto8OsKHauJKjHzezzHwLxomLd/98YOn7sXuvfmK5hcwSgOB8tgLF/tziaU5SpSP1Eb5v6c4L9A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608040330256254.62874280802225; Tue, 15 Dec 2020 05:52:10 -0800 (PST) Received: from localhost ([::1]:34668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpAkL-0003fG-0e for importer@patchew.org; Tue, 15 Dec 2020 08:52:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpAgw-0008HC-Cj for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpAgu-0007HI-LF for qemu-devel@nongnu.org; Tue, 15 Dec 2020 08:48:38 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-aMPQGGotMKWVJBlsYr-4lA-1; Tue, 15 Dec 2020 08:48:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2A63801B16; Tue, 15 Dec 2020 13:48:30 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F26719442; Tue, 15 Dec 2020 13:48:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C1F999D9D; Tue, 15 Dec 2020 14:48:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608040115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cu4gV/dipbPIP+N6xRJLWM5eaWb2SoyMOdSGji2ylcI=; b=Vpjp0EKmgiOfeo1hdibb8huqEgLRPzyiz4M07HMm3FLKePRhbfeWn6OvP6QmWhsO8zFX34 lcFnremTqEjTk8ekaovGYiGvMWj3rSooQ0D985OGEBDTHw0IVHxw/Fok9C2tGIdTRG6y05 zu83b3NLDE2tkbBcokGvAVvlkcIcm8w= X-MC-Unique: aMPQGGotMKWVJBlsYr-4lA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 7/7] audio: add sanity check Date: Tue, 15 Dec 2020 14:48:26 +0100 Message-Id: <20201215134826.5504-8-kraxel@redhat.com> In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com> References: <20201215134826.5504-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: dann frazier , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Check whenever we actually found the spiceaudio driver before flipping the can_be_default field. Fixes: f0c4555edfdd ("audio: remove qemu_spice_audio_init()") Buglink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D977301 Reported-by: dann frazier Signed-off-by: Gerd Hoffmann Message-Id: <20201215081151.20095-1-kraxel@redhat.com> --- audio/audio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/audio/audio.c b/audio/audio.c index 0fdb808d6a57..b48471bb3f64 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1684,7 +1684,9 @@ static AudioState *audio_init(Audiodev *dev, const ch= ar *name) * backend and this can go away. */ driver =3D audio_driver_lookup("spice"); - driver->can_be_default =3D 1; + if (driver) { + driver->can_be_default =3D 1; + } } =20 if (dev) { --=20 2.27.0