From nobody Fri Oct 10 04:26:44 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=1592572928; cv=none; d=zohomail.com; s=zohoarc; b=BVlB8URWU/innnzwuBsAKRoH81do0cvfBHjTjiIiZ/qbYhEJacdMVhq8TL1P4ZovD89t7h3+pBpSttSq5yQHfNRSjbBeJeRc1uaDkzFJgL5g5mSKF5VM7hJoVgaMwV40h0V55b7KMWaaa1ZWJwfdlbb4GELLylp9k+sREnhR9Yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572928; 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=N1c9BQx11x41ffPvg5cZuk3HbuS5fDo5PBxVW02RQIo=; b=dwawr6DNmExaM8QtBaQnFrmyVQ0cK7s9fT96V6HB7bBRvk/KAZcsTg0L97L+e8MmN6fcyYKUGmz+STfkiqhexJHjVTTkeh5OsikSP3T10EcEN6dD49WgTjivroMTMcDtEpNXyIiBE7gVSRlFPmElXx6bF8DTMAJvtnIai00KB8U= 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 1592572928441855.8475906687305; Fri, 19 Jun 2020 06:22:08 -0700 (PDT) Received: from localhost ([::1]:45250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGy7-0007mC-KH for importer@patchew.org; Fri, 19 Jun 2020 09:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu3-0001w9-2e for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59611 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 1jmGu1-000384-ED for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:54 -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-132-cPFrpP6ZPpWJWg3_mi2n7A-1; Fri, 19 Jun 2020 09:17:50 -0400 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 6418D107ACCA; Fri, 19 Jun 2020 13:17:49 +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 CD5FF5BAC7; Fri, 19 Jun 2020 13:17:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 698471750C; 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=1592572672; 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=N1c9BQx11x41ffPvg5cZuk3HbuS5fDo5PBxVW02RQIo=; b=bSMX5oT+VxUkpi0bZERGxKK5RLpudW/h8ZPAyEsqUTs6VAUHnW4mdvBF2DZiKf1zvMjoXv NXmq74UyNENpZKKaVlZ4Fnux62HYrbIuhsldCgqtbMCke8BLYehdq0j4habqZL1qfwrgt0 s2C8wiFakgh/Be5w7P95RRn2KMo27EY= X-MC-Unique: cPFrpP6ZPpWJWg3_mi2n7A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/7] audio/jack: fix invalid minimum buffer size check Date: Fri, 19 Jun 2020 15:17:35 +0200 Message-Id: <20200619131741.10857-2-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.15 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 JACK does not provide us with the configured buffer size until after activiation which was overriding this minimum value. JACK itself doesn't have this minimum limitation, but the QEMU virtual hardware and as such it must be enforced, failure to do so results in audio discontinuities. Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-2-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index 722ddb1dfe43..d0b6f748f26c 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -434,17 +434,6 @@ static int qjack_client_init(QJackClient *c) jack_set_xrun_callback(c->client, qjack_xrun, c); jack_on_shutdown(c->client, qjack_shutdown, c); =20 - /* - * ensure the buffersize is no smaller then 512 samples, some (all?) q= emu - * virtual devices do not work correctly otherwise - */ - if (c->buffersize < 512) { - c->buffersize =3D 512; - } - - /* create a 2 period buffer */ - qjack_buffer_create(&c->fifo, c->nchannels, c->buffersize * 2); - /* allocate and register the ports */ c->port =3D g_malloc(sizeof(jack_port_t *) * c->nchannels); for (int i =3D 0; i < c->nchannels; ++i) { @@ -468,6 +457,17 @@ static int qjack_client_init(QJackClient *c) jack_activate(c->client); c->buffersize =3D jack_get_buffer_size(c->client); =20 + /* + * ensure the buffersize is no smaller then 512 samples, some (all?) q= emu + * virtual devices do not work correctly otherwise + */ + if (c->buffersize < 512) { + c->buffersize =3D 512; + } + + /* create a 2 period buffer */ + qjack_buffer_create(&c->fifo, c->nchannels, c->buffersize * 2); + qjack_client_connect_ports(c); c->state =3D QJACK_STATE_RUNNING; return 0; --=20 2.18.4 From nobody Fri Oct 10 04:26:44 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=1592572797; cv=none; d=zohomail.com; s=zohoarc; b=GHT5fgEfCe9aopZmy/vQi4qA9GxAc02ROLJEd1kKFRrvyMdOpHNg/fVZrsNP91e8RMYPVpVEmjTg61eKkp3BsHp/bVWOx551mL0IlESiXHd/tVMQLsnbQGsXYwv6pcqhl+H2bS17dvj3AY3v89zHXtIflGOgBalpFCpui63RQhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572797; 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=pCVj/Q96zUKoCSwG/g8CFBhGNz77ZZvimy2Vdwg6ShA=; b=higORzVAv8pxcEJb163Pg10TPqzKWVm1hMBNmoxv30lP6/87ZyMxD3Dgh4Z+Kh0Yer4qlvLMHT9M02ZdP/JSvXby8Ju9f5NYzjZMZL92nbqy50JWlKj5UHmmsGKZLImxrGd1pge30SuV6TSyRGhhj1VuGgS8d3Nk0L11UJfqgSg= 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 1592572797966732.2670869821043; Fri, 19 Jun 2020 06:19:57 -0700 (PDT) Received: from localhost ([::1]:36708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGvz-0003rp-Bh for importer@patchew.org; Fri, 19 Jun 2020 09:19:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu0-0001sE-Ur for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27290 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-00037e-6c 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-3-7oNrnaTeMrGVcxeXvfH2NA-1; Fri, 19 Jun 2020 09:17:48 -0400 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 7A4E1835B40; 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 D47D97CAA8; Fri, 19 Jun 2020 13:17:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 726C61753C; 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=pCVj/Q96zUKoCSwG/g8CFBhGNz77ZZvimy2Vdwg6ShA=; b=U5xlvmAc+NrfkDccyYYG5o+5toA+bL+GJbP/rIY59vSeqkw5OLQaDqnd9B6VeAmEO5nzGk KepkD8MNf836jpubBvKGks7gMQkQz0VWTfpiyhyLhWByQEqEqtIiyfhBgrye2S66PIfdkC PLwNgBLW4LCgAZCXIy4huBEsLXwDka0= X-MC-Unique: 7oNrnaTeMrGVcxeXvfH2NA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/7] audio/jack: remove unused stopped state Date: Fri, 19 Jun 2020 15:17:36 +0200 Message-Id: <20200619131741.10857-3-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.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 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=207.211.31.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 03:15:03 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_H3=-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 Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-3-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index d0b6f748f26c..fb8efd7af7c7 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -38,7 +38,6 @@ struct QJack; =20 typedef enum QJackState { QJACK_STATE_DISCONNECTED, - QJACK_STATE_STOPPED, QJACK_STATE_RUNNING, QJACK_STATE_SHUTDOWN } @@ -549,9 +548,6 @@ static void qjack_client_fini(QJackClient *c) { switch (c->state) { case QJACK_STATE_RUNNING: - /* fallthrough */ - - case QJACK_STATE_STOPPED: for (int i =3D 0; i < c->nchannels; ++i) { jack_port_unregister(c->client, c->port[i]); } --=20 2.18.4 From nobody Fri Oct 10 04:26:44 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=1592572822; cv=none; d=zohomail.com; s=zohoarc; b=OY1iKvwxjP/qYK4lkEjdzrFIbPgy410kGRB0uipPc18ZgRX+S4atX7nfssbX7uxzC0bKLmg57oYGZKChm7NuGwWsvLxpdc1py1Kkcdtv9rZeK7+vtmREm21uZTlHD0XRJIz/dTbCbUsk91SU0mtCQM37mhcOKDOe1LzeNqkD19Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572822; 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=2spzZp7YNxUHSDFw+hg2vvBDafbe+cjYmHrIRcCA8uY=; b=JOzWbj17I1Fgzq2YFnmN+YPBwoy3CXXMJ8rlr/Z/t9/TqfUEF9Qwe54lH0fIdg/c4yaepcv691S5zKqpjh3yjJir6g9GC7I8Jg9Rir2IT265WT/y2zbUCY2pkWaBXLiwV8o3j77vqjiqIWdHcnzSfUtcnwZumGYzpSq4zKhqclk= 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 1592572822456483.61360662554773; Fri, 19 Jun 2020 06:20:22 -0700 (PDT) Received: from localhost ([::1]:38636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGwO-0004jC-Uw for importer@patchew.org; Fri, 19 Jun 2020 09:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGtz-0001qZ-QA for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:51 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24976 helo=us-smtp-delivery-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 1jmGty-00037Z-5C for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:51 -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-38-g22U_K4kO3ymlOGpDdQA8Q-1; Fri, 19 Jun 2020 09:17:46 -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 F39FA835B41; Fri, 19 Jun 2020 13:17:45 +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 DF87960BE1; Fri, 19 Jun 2020 13:17:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7B67E1753D; 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=1592572669; 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=2spzZp7YNxUHSDFw+hg2vvBDafbe+cjYmHrIRcCA8uY=; b=LMZWBRNubuYGH6tcId+iMW/HzFbomKFaTX5s+x4vsoEh2i1ex0MlkiSsArwlyoiPwP6AJL Os8Ey+9jEEgkx8YO+myYEhG1e3SjE59gLSD+RZ+REk5kGzHISS/CBYM/gPFIC6rFAYFAh8 AItWpZyJNXt4fMO62FOOvYL8H13D5rI= X-MC-Unique: g22U_K4kO3ymlOGpDdQA8Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/7] audio/jack: remove invalid set of input support bool Date: Fri, 19 Jun 2020 15:17:37 +0200 Message-Id: <20200619131741.10857-4-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 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 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.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/19 02:45:39 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_H3=-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 Initial code for JACK did not support audio input and as such this boolean was set to let QEMU know, however JACK ended up including input support making this invalid. Further investigation shows it was invalid to set it in the first instance anyway due to a failure on my part understand properly what this was for when the audodev was initially developed. Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-4-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index fb8efd7af7c7..58c73444977e 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -607,9 +607,6 @@ static int qjack_thread_creator(jack_native_thread_t *t= hread, static void *qjack_init(Audiodev *dev) { assert(dev->driver =3D=3D AUDIODEV_DRIVER_JACK); - - dev->u.jack.has_in =3D false; - return dev; } =20 --=20 2.18.4 From nobody Fri Oct 10 04:26:44 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=1592573054; cv=none; d=zohomail.com; s=zohoarc; b=PBhjsIsoK147ocFH7IzApJsi/q3kh2VlDxEYa7xllCWhGXSQQDtwCzfUf6DZ+AkwZvYfvTwpAiP82Fc3stS/zO4cV0dctnoOGqR3g+FvDXRPmJCiSmwiGnJLG1KoRiUJpLrY9LdB2Ug9lwmvJMa0GULsVpjxOKGXgl32BhLV8n8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573054; 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=ThA4PcGmHPjm0a2hIhKL6GKElc9TuBBquvXBGHtlg3o=; b=BasRmXkvB44posqdaDBL5QJ8kLPr7STBuylbm6zatIGNdnAsjsa8c4AEoPIeIi3o7UZqeJQS8b4o/ZuBZwQ+/g+1b95DeMZa2IlFyAy9/hOT0CNmjseDRjgd6Y+qpGRgCtVCo6GIMdu5MGtu1pYvlELYhrAJEj7IFVC1k7Rydzg= 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 1592573054927945.9499028537562; Fri, 19 Jun 2020 06:24:14 -0700 (PDT) Received: from localhost ([::1]:52854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmH0A-0003jH-2d for importer@patchew.org; Fri, 19 Jun 2020 09:24:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu1-0001sh-4Y for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:53 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:32638 helo=us-smtp-delivery-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-00037j-FX 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-464-8BfNKi7zPiamzpPfHnG41g-1; Fri, 19 Jun 2020 09:17:48 -0400 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 87CD3EC1A2; 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 C3B897C1E5; Fri, 19 Jun 2020 13:17:46 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 845CC9D8F; 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=ThA4PcGmHPjm0a2hIhKL6GKElc9TuBBquvXBGHtlg3o=; b=LnI3BHKCdn4NXaYEFbg7sJCN3c+GxK00oR8GLYLI7JC3g5+R6xE1+Ir9YCiNCyzn0mTIgq zMMmDbqSfuU0nhRDdfNOVXMwMWqY+uPNP1rM/t2ekP1ldn6m6p6ZD1oGikF2iznZfS+nZa KkA4vL4GVU+iM+bLvxyS6jrS1Tt/p4E= X-MC-Unique: 8BfNKi7zPiamzpPfHnG41g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/7] audio/jack: do not remove ports when finishing Date: Fri, 19 Jun 2020 15:17:38 +0200 Message-Id: <20200619131741.10857-5-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.13 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.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/19 02:45:39 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_H3=-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 This fixes a hang when there is a communications issue with the JACK server. Simply closing the connection is enough to completely clean up and as such we do not need to remove the ports first. As JACK uses a socket based protocol that relies on the `select` call, if there is a communication breakdown with the server the client library waits forever for a response to the unregister request. Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-5-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index 58c73444977e..249cbd3265c5 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -548,9 +548,6 @@ static void qjack_client_fini(QJackClient *c) { switch (c->state) { case QJACK_STATE_RUNNING: - for (int i =3D 0; i < c->nchannels; ++i) { - jack_port_unregister(c->client, c->port[i]); - } jack_deactivate(c->client); /* fallthrough */ =20 --=20 2.18.4 From nobody Fri Oct 10 04:26:44 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=1592572908; cv=none; d=zohomail.com; s=zohoarc; b=eZuUzXY8VQGMBArHvnSNWD5JtcE1U4+PIgnPzaQQi6dXKYMAYkS300WVCQ4FtaM4Fic5shSxzKVh/I5AI/9c6YwS2B8e6ryOCjV3z1DWG2+xKwYpRv0wlNHrjgjHsrHqu3x1z44WOErtRmWz3J9fs5nBrdJVCfQQrL+lEPj86aA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572908; 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=tt2MqH4x5xif840Q+MJPvJJfNlTyLOyjD2Lm0Z9OQVI=; b=YNS2LGI7tP8QFibuvBqf6mdUh4Fm+qpwzkjywQgJK/nfbkjcRdjG6gMjaoOFj2R7SoXY2cbx+1Fwxkj1M1SCMaYEPZOzKwpNC8xxiLG/K4nT37zPQ78K42OPZF/2igPPdXjHBJ4VfF5VY8VAbZ6R79OU912f45DAfcNnnc2NZ4A= 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 1592572908676819.977119359765; Fri, 19 Jun 2020 06:21:48 -0700 (PDT) Received: from localhost ([::1]:44142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGxl-0007JY-Qt for importer@patchew.org; Fri, 19 Jun 2020 09:21:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu4-00021A-Jl for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27504 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 1jmGu2-00038O-7K for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:56 -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-437-FRPllmUDOaa-G9TwGUO6Pw-1; Fri, 19 Jun 2020 09:17:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B52FB10059A1; Fri, 19 Jun 2020 13:17:50 +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 54CC55C1D6; Fri, 19 Jun 2020 13:17:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8D68C9D92; 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=1592572673; 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=tt2MqH4x5xif840Q+MJPvJJfNlTyLOyjD2Lm0Z9OQVI=; b=K0VDOHGt1pyJde34lcvDoI+kmj7oKP13Va8IpYT0JrRChKiVF5/CrhCvYPaAuUNuDPEBVm iX++yzsROy3aVkUx9374Ay3Cxfigwka0RkCYXRNEOwSzsIJZ4MZa6RtiJmamntwXtNFFAe hWmbgBbO3BAyRALXnAOrPRGehgmg4QI= X-MC-Unique: FRPllmUDOaa-G9TwGUO6Pw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/7] audio/jack: honour the enable state of the audio device Date: Fri, 19 Jun 2020 15:17:39 +0200 Message-Id: <20200619131741.10857-6-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.16 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=207.211.31.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 03:15:03 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_H3=-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 When the guest closes the audio device we must start dropping input samples from JACK and zeroing the output buffer samples. Failure to do so causes sound artifacts during operations such as guest OS reboot, and causes a hang of the input pipeline breaking it until QEMU is restated. Closing and reconnecting to JACK was tested during these enable/disable calls which works well for Linux guests, however Windows re-opens the audio hardware repeatedly even when doing simple tasks like playing a system sounds. As such it was decided it is better to feed silence to JACK while the device is disabled. Signed-off-by: Geoffrey McRae Message-id: 20200613040518.38172-6-geoff@hostfission.com Signed-off-by: Gerd Hoffmann --- audio/jackaudio.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index 249cbd3265c5..b2b53985ae61 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -56,7 +56,7 @@ typedef struct QJackClient { AudiodevJackPerDirectionOptions *opt; =20 bool out; - bool finished; + bool enabled; bool connect_ports; int packets; =20 @@ -271,9 +271,17 @@ static int qjack_process(jack_nframes_t nframes, void = *arg) } =20 if (c->out) { - qjack_buffer_read_l(&c->fifo, buffers, nframes); + if (likely(c->enabled)) { + qjack_buffer_read_l(&c->fifo, buffers, nframes); + } else { + for(int i =3D 0; i < c->nchannels; ++i) { + memset(buffers[i], 0, nframes * sizeof(float)); + } + } } else { - qjack_buffer_write_l(&c->fifo, buffers, nframes); + if (likely(c->enabled)) { + qjack_buffer_write_l(&c->fifo, buffers, nframes); + } } =20 return 0; @@ -314,8 +322,8 @@ static void qjack_client_recover(QJackClient *c) if (c->state =3D=3D QJACK_STATE_DISCONNECTED && c->packets % 100 =3D=3D 0) { =20 - /* if not finished then attempt to recover */ - if (!c->finished) { + /* if enabled then attempt to recover */ + if (c->enabled) { dolog("attempting to reconnect to server\n"); qjack_client_init(c); } @@ -387,7 +395,6 @@ static int qjack_client_init(QJackClient *c) char client_name[jack_client_name_size()]; jack_options_t options =3D JackNullOption; =20 - c->finished =3D false; c->connect_ports =3D true; =20 snprintf(client_name, sizeof(client_name), "%s-%s", @@ -483,8 +490,10 @@ static int qjack_init_out(HWVoiceOut *hw, struct audse= ttings *as, } =20 jo->c.out =3D true; + jo->c.enabled =3D false; jo->c.nchannels =3D as->nchannels; jo->c.opt =3D dev->u.jack.out; + int ret =3D qjack_client_init(&jo->c); if (ret !=3D 0) { return ret; @@ -519,8 +528,10 @@ static int qjack_init_in(HWVoiceIn *hw, struct audsett= ings *as, } =20 ji->c.out =3D false; + ji->c.enabled =3D false; ji->c.nchannels =3D as->nchannels; ji->c.opt =3D dev->u.jack.in; + int ret =3D qjack_client_init(&ji->c); if (ret !=3D 0) { return ret; @@ -568,23 +579,25 @@ static void qjack_client_fini(QJackClient *c) static void qjack_fini_out(HWVoiceOut *hw) { QJackOut *jo =3D (QJackOut *)hw; - jo->c.finished =3D true; qjack_client_fini(&jo->c); } =20 static void qjack_fini_in(HWVoiceIn *hw) { QJackIn *ji =3D (QJackIn *)hw; - ji->c.finished =3D true; qjack_client_fini(&ji->c); } =20 static void qjack_enable_out(HWVoiceOut *hw, bool enable) { + QJackOut *jo =3D (QJackOut *)hw; + jo->c.enabled =3D enable; } =20 static void qjack_enable_in(HWVoiceIn *hw, bool enable) { + QJackIn *ji =3D (QJackIn *)hw; + ji->c.enabled =3D enable; } =20 static int qjack_thread_creator(jack_native_thread_t *thread, --=20 2.18.4 From nobody Fri Oct 10 04:26:44 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 From nobody Fri Oct 10 04:26:44 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=1592572930; cv=none; d=zohomail.com; s=zohoarc; b=ajqtRYqeglHLGnpXKk52ua8jIrr99e8DsRpA0yo5n2JfIqDmlHZEea6wstyNfHunEAF/FeoH+CEOiOoaBuaE6GgSXKRKX3nwLYdi+xWMlxwKbV0ixxopILycw3eqy9BJV/hY6BAYL2+d1NU4Ff4NYs0Yf5DV5RflSLKvYbvla5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592572930; 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=ADLGoijcriWal76g9pZL90rjMe6sgPfFLAkeGhj1ZKQ=; b=fCF3iLZTauh6zLJYk0H03hRb4hGj80CAP2gDySOEkyAzf6c7FFhAu7chYyFCeYOY8fTK/onyx6jge1LtWWq6Rgithuybv8yI9ACVmmDc4mzuhj5vJoB2Asn1MRpM9ZHEAzgtkqRDUA/6hDgKviBIZJ8YKdS5rPgSIadgiR0mHAc= 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 1592572930953440.71085410616297; Fri, 19 Jun 2020 06:22:10 -0700 (PDT) Received: from localhost ([::1]:45446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmGy9-0007ra-UF for importer@patchew.org; Fri, 19 Jun 2020 09:22:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmGu3-0001wP-9g for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28789 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 1jmGu1-00038C-Hq for qemu-devel@nongnu.org; Fri, 19 Jun 2020 09:17:54 -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-80-anF8DNeBMF2B7yrzLYlAMQ-1; Fri, 19 Jun 2020 09:17:51 -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 4E134801503; Fri, 19 Jun 2020 13:17:49 +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 4916C60F88; Fri, 19 Jun 2020 13:17:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A0BEE9D95; 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=1592572672; 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=ADLGoijcriWal76g9pZL90rjMe6sgPfFLAkeGhj1ZKQ=; b=IH8YTxvFPFHxF+UophBmN8S4diW4frojBJAZRR/WIZurAaUdb5GQiNWoCAUI7kwOdbWGoz MBysd9IXjqwaNTQFs69Krr/XEZUBgyoU1bBviHd1HTvFchSv/rcPLtlVjCkLl4JcKt3vWN 9/jGq6rm+zoUgTRJ76Rszwurc6OHy8I= X-MC-Unique: anF8DNeBMF2B7yrzLYlAMQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 7/7] hw/audio/gus: Fix registers 32-bit access Date: Fri, 19 Jun 2020 15:17:41 +0200 Message-Id: <20200619131741.10857-8-kraxel@redhat.com> In-Reply-To: <20200619131741.10857-1-kraxel@redhat.com> References: <20200619131741.10857-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Allan Peramaki , Gerd Hoffmann , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Allan Peramaki Fix audio on software that accesses DRAM above 64k via register peek/poke and some cases when more than 16 voices are used. Cc: qemu-stable@nongnu.org Fixes: 135f5ae1974c ("audio: GUSsample is int16_t") Signed-off-by: Allan Peramaki Tested-by: Volker R=C3=BCmelin Reviewed-by: Volker R=C3=BCmelin Reviewed-by: Thomas Huth Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200618103623.6031-1-philmd@redhat.com Message-Id: <20200615201757.16868-1-aperamak@pp1.inet.fi> [PMD: Removed unrelated style changes] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Gerd Hoffmann --- hw/audio/gusemu_hal.c | 2 +- hw/audio/gusemu_mixer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c index ae40ca341cc4..5b9a14ee21b6 100644 --- a/hw/audio/gusemu_hal.c +++ b/hw/audio/gusemu_hal.c @@ -32,7 +32,7 @@ =20 #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) =20 /* size given in bytes */ unsigned int gus_read(GUSEmuState * state, int port, int size) diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c index 00b9861b92b2..56300de77e44 100644 --- a/hw/audio/gusemu_mixer.c +++ b/hw/audio/gusemu_mixer.c @@ -28,7 +28,7 @@ =20 #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) =20 #define GUSvoice(position) (*(uint16_t *)(voiceptr+(position))) =20 --=20 2.18.4