From patchwork Fri Aug 21 15:37:25 2015 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: 509568 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 7A5D31402C8 for ; Sat, 22 Aug 2015 02:03:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=r6Ywnevr; dkim-atps=neutral Received: from localhost ([::1]:42349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSonK-0007FY-K0 for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 12:03:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOL-0002eK-HR for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoOK-00028g-AU for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:05 -0400 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:34882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOK-00028W-3o for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:04 -0400 Received: by wicne3 with SMTP id ne3so19124173wic.0 for ; Fri, 21 Aug 2015 08:38:03 -0700 (PDT) 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=+2YxJrJ11e0wXISNX1Jql+g8oNUhC8iwpImHdqy8BWk=; b=r6Ywnevr3FQ4uQWBCJDugNdmA2E6ab+LM1l7D0mjRawUKgiTIkcoF33oiUVbGw50HY IjjQ4SA/iW/eKIrXR9RCA10qlwtoOQi6wv0HBLvqj+J6veULPaJ8wUuYGoYsPnX3i9pZ dO1Nf7pl6H/KUA62RefY/Le9FSxMpFeaCCaqCZW+bc8Df8jGFRpeeHs8ZCxbszdJEJY5 tbDZiwnKqyPQyBUGmiwtP3SZEw+MU1LyXG65CvlGEndEjqE8vzP0FDnnaqT4iAL0mfR/ mrVT8Jt0VJ6ZsK2dyO8Yvs+yH3Y8XsvEiLXHKGH3aL/iiQxVNjdukfe7TOpWHdGA2xnM 9vNg== X-Received: by 10.180.105.165 with SMTP id gn5mr7095645wib.20.1440171483504; Fri, 21 Aug 2015 08:38:03 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-172-216.pool.digikabel.hu. [178.164.172.216]) by smtp.gmail.com with ESMTPSA id v8sm10479895wjr.15.2015.08.21.08.38.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:38:03 -0700 (PDT) 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: Fri, 21 Aug 2015 17:37:25 +0200 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::231 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 29/49] 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 17e8992..3e5612b 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; }