From nobody Fri Oct 10 09:48:03 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=1592572948; cv=none; d=zohomail.com; s=zohoarc; b=PnnIoLi68ksOmAIrV2n1w45A12xVnOEmH3kIP8dprXOAiNqRs3SWYvB1RK20bNQiuHEiUpJYO+coqYowvtEXFBs1aSvuja0g9yHFk0MWKcuGttkTaeWTRf/gRlHY/mtjci38AhWuRy/cWNyk6WJewcbI8VuJO62+nWgZ1XupojM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572948; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=jPa2YSuhcE8XmFP/p7u4U5O131eiJBvelXpiMbSwNpA=; b=YlVJzMB3DHuDQzGq2hBiFXwrsjyzxh5t6Rsn2IUUTQgFcosc/UNi6yH0WS4fXWzBTt7UxmXiFaYNf0VGSwaqYcgG5HgwmeJBxYUvXTs+HOYJfnYiAEjwNyQnQkfxyIKIWzFt3Kz0BulouxHfWn5xc/wQ8ZuC/NYZnMWsp9pVG2U= 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 1592572948892857.800833683007; Fri, 19 Jun 2020 06:22:28 -0700 (PDT) Received: from localhost ([::1]:47292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGyS-0000Qp-2E for importer@patchew.org; Fri, 19 Jun 2020 09:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu1-0001sn-6j for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:53 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55695 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jmGtz-00037f-Ey for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:52 -0400 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-468-5QRxkxiIMZS7ugoNQBWIjA-1; Fri, 19 Jun 2020 09:17:48 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A452910059A1; Fri, 19 Jun 2020 13:17:47 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C43C60F88; Fri, 19 Jun 2020 13:17:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 963BE9D94; Fri, 19 Jun 2020 15:17:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592572670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=jPa2YSuhcE8XmFP/p7u4U5O131eiJBvelXpiMbSwNpA=; b=HJ3PAkzALOFY1Y3KKaIc9+t9+r6gGF/zs/+tDumFMMsmie0p/bJPh7HNTiT9zXHXcQCj2R 8BcvvQJWG1+G8jXJnxTXIuc8ThjAQaSMEIoNu5rETEmUU0NjkU4LitPf1d+xfPvzhGgAl4 epnlMTCTZicMpewmqvAqVcjKNbcQivg= X-MC-Unique: 5QRxkxiIMZS7ugoNQBWIjA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 6/7] audio/jack: simplify the re-init code path Date: Fri, 19 Jun 2020 15:17:40 +0200 Message-Id: <20200619131741.10857-7-kraxel@redhat.com> In-Reply-To: <20200619131741.10857-1-kraxel@redhat.com> References: <20200619131741.10857-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/19 05:19:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Geoffrey McRae , 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Geoffrey McRae Instead of checking for the audodev state in each code path, centralize the check into the initialize function itself to make it safe to call it at any time. Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-7-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index b2b53985ae61..72ed7c492998 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -395,6 +395,10 @@ static int qjack_client_init(QJackClient *c) char client_name[jack_client_name_size()]; jack_options_t options =3D JackNullOption; =20 + if (c->state =3D=3D QJACK_STATE_RUNNING) { + return 0; + } + c->connect_ports =3D true; =20 snprintf(client_name, sizeof(client_name), "%s-%s", @@ -485,9 +489,7 @@ static int qjack_init_out(HWVoiceOut *hw, struct audset= tings *as, QJackOut *jo =3D (QJackOut *)hw; Audiodev *dev =3D (Audiodev *)drv_opaque; =20 - if (jo->c.state !=3D QJACK_STATE_DISCONNECTED) { - return 0; - } + qjack_client_fini(&jo->c); =20 jo->c.out =3D true; jo->c.enabled =3D false; @@ -523,9 +525,7 @@ static int qjack_init_in(HWVoiceIn *hw, struct audsetti= ngs *as, QJackIn *ji =3D (QJackIn *)hw; Audiodev *dev =3D (Audiodev *)drv_opaque; =20 - if (ji->c.state !=3D QJACK_STATE_DISCONNECTED) { - return 0; - } + qjack_client_fini(&ji->c); =20 ji->c.out =3D false; ji->c.enabled =3D false; --=20 2.18.4