From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAJiI-0005Jj-81 for qemu-devel@nongnu.org; Thu, 24 Jul 2014 10:09:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XAJi8-0008Qx-Of for qemu-devel@nongnu.org; Thu, 24 Jul 2014 10:09:42 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:53139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAJi8-0008Qg-Hd for qemu-devel@nongnu.org; Thu, 24 Jul 2014 10:09:32 -0400 Received: by mail-wi0-f181.google.com with SMTP id bs8so3998553wib.14 for ; Thu, 24 Jul 2014 07:09:30 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 24 Jul 2014 16:09:23 +0200 Message-Id: <1406210963-15846-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for-2.1] qemu-char: ignore flow control if a PTY's slave is not connected List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: phrdina@redhat.com, batuzovk@ispras.ru After commit f702e62 (serial: change retry logic to avoid concurrency, 2014-07-11), guest boot hangs if the backend is an unconnected PTY. The reason is that PTYs do not support G_IO_HUP, and serial_xmit is never called. To fix this, simply invoke serial_xmit immediately (via g_idle_source_new) when this happens. Signed-off-by: Paolo Bonzini --- qemu-char.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index 7acc03f..64d3473 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1168,7 +1168,11 @@ static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len) static GSource *pty_chr_add_watch(CharDriverState *chr, GIOCondition cond) { PtyCharDriver *s = chr->opaque; - return g_io_create_watch(s->fd, cond); + if (!s->connected) { + return g_idle_source_new(); + } else { + return g_io_create_watch(s->fd, cond); + } } static int pty_chr_read_poll(void *opaque) -- 1.8.3.1