From patchwork Thu Jan 14 13:45:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 567434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BD35414029E for ; Fri, 15 Jan 2016 00:52:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NZ67m1JX; dkim-atps=neutral Received: from localhost ([::1]:42559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiJp-0001h4-Lu for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 08:52:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEP-0001Mc-TS for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEN-0003T1-KB for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:28 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEN-0003Su-EV for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:27 -0500 Received: by mail-wm0-x242.google.com with SMTP id f206so43694042wmf.2 for ; Thu, 14 Jan 2016 05:46:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=4kYKH6xLEjhpUp3tI3KlJnP6X1WceXFdCAbQ89FWqMY=; b=NZ67m1JXvGlsMAnJWmZ8WP1KupEQv8F5mhgNNb3lpjN6q2m3V5i/fUgFdp3YkkcgO5 nTZRPZNp75tZesSKnQjBjLNoHFljrmgk9wIK589O3mgyG1c5F8cCzQvcMTqdrV2rtYZp cb54cUcOdBQ8TYELccqH1b/0AkFLN6JV2Zg9DWaLUQil7YEpDxjjsnRgxvoSVAPlmlPt b7MKuzTHDh4b/h5x9yzcuvYJ9A48NG2GBarsjnB1pWjW4sbCsB+cmje7MCS8TZ0Vcuxw X8tW9KpVajAFPhLRFPQdOdV+/hMTEFAJqcccF4eNunr3ILizV6ogbcRp7GotEgo7Zg6q Nx6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=4kYKH6xLEjhpUp3tI3KlJnP6X1WceXFdCAbQ89FWqMY=; b=JLq77nMH5GGhFtS18gJ/RyohbCAGHp98mnwJDTQQ6mMHp9bM+BMGYReb0jC7LQEShA STJ2lBQZAP4V5Wq5mghGhn26zYXFin111HXpqPXIMZUfXqfg1UOqh6Cwp/LCFo4Iwrdb mSCm3ftqhOKyNzuctfAbhxWBK209ATg3ukezxnx3413cxDwtXi7KtxwP3YdN7VGaw/Rx 9kAWSL6Di/U2prj4Sa5szeVdaKcxmIcb+Q6WwvXECqb4Oz0cVmyjOn9oDDGZ7cS7VRkr VmdkE5+jfgnEfIR0bJiL2KAKqd/PDOldGdC1XiVnwPKL4RB8nwNXUoTu/SSuBkZRlPST nWwQ== X-Gm-Message-State: ALoCoQmo8sTM2bgOeUdccjvJvIwYimwIxrzoRFVK8VSjrti9sHWw4O1Kh0lawMCCHDsGwUU3nno1nDaAKx92jtNOh4QrdugktA== X-Received: by 10.194.203.99 with SMTP id kp3mr4212580wjc.3.1452779186950; Thu, 14 Jan 2016 05:46:26 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:26 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2016 14:45:35 +0100 Message-Id: <92b460d592d9f446916bb188bec0fb307a7a4092.1452776884.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 22/51] paaudio: properly disconnect streams in fini_* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently this needs a workaround due to bug #74624 in pulseaudio. Reviewed-by: Marc-André Lureau Signed-off-by: Kővágó, Zoltán --- audio/paaudio.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 53561dd..c9b2fcd 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -679,6 +679,25 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) return -1; } +static void qpa_simple_disconnect(PAConnection *c, pa_stream *stream) +{ + int err; + + pa_threaded_mainloop_lock(c->mainloop); + /* wait until actually connects. workaround pa bug #74624 + * https://bugs.freedesktop.org/show_bug.cgi?id=74624 */ + while (pa_stream_get_state(stream) == PA_STREAM_CREATING) { + pa_threaded_mainloop_wait(c->mainloop); + } + + err = pa_stream_disconnect(stream); + if (err != 0) { + dolog("Failed to dissconnect! err=%d\n", err); + } + pa_stream_unref(stream); + pa_threaded_mainloop_unlock(c->mainloop); +} + static void qpa_fini_out (HWVoiceOut *hw) { void *ret; @@ -690,7 +709,7 @@ static void qpa_fini_out (HWVoiceOut *hw) audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); if (pa->stream) { - pa_stream_unref (pa->stream); + qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream = NULL; } @@ -710,7 +729,7 @@ static void qpa_fini_in (HWVoiceIn *hw) audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); if (pa->stream) { - pa_stream_unref (pa->stream); + qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream = NULL; }