qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Geoffrey McRae <geoff@hostfission.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 4/7] audio/jack: do not remove ports when finishing
Date: Fri, 19 Jun 2020 15:17:38 +0200	[thread overview]
Message-ID: <20200619131741.10857-5-kraxel@redhat.com> (raw)
In-Reply-To: <20200619131741.10857-1-kraxel@redhat.com>

From: Geoffrey McRae <geoff@hostfission.com>

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 <geoff@hostfission.com>
Message-id: 20200613040518.38172-5-geoff@hostfission.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 = 0; i < c->nchannels; ++i) {
-            jack_port_unregister(c->client, c->port[i]);
-        }
         jack_deactivate(c->client);
         /* fallthrough */
 
-- 
2.18.4



  parent reply	other threads:[~2020-06-19 13:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-19 13:17 [PULL 0/7] Audio 20200619 patches Gerd Hoffmann
2020-06-19 13:17 ` [PULL 1/7] audio/jack: fix invalid minimum buffer size check Gerd Hoffmann
2020-06-19 13:17 ` [PULL 2/7] audio/jack: remove unused stopped state Gerd Hoffmann
2020-06-19 13:17 ` [PULL 3/7] audio/jack: remove invalid set of input support bool Gerd Hoffmann
2020-06-19 13:17 ` Gerd Hoffmann [this message]
2020-06-19 13:17 ` [PULL 5/7] audio/jack: honour the enable state of the audio device Gerd Hoffmann
2020-06-19 13:17 ` [PULL 6/7] audio/jack: simplify the re-init code path Gerd Hoffmann
2020-06-19 13:17 ` [PULL 7/7] hw/audio/gus: Fix registers 32-bit access Gerd Hoffmann
2020-06-19 13:56 ` [PULL 0/7] Audio 20200619 patches no-reply
2020-06-19 14:07 ` no-reply
2020-06-22 13:45 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200619131741.10857-5-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=geoff@hostfission.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).