aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-07-24 16:08:04 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-07-25 14:36:07 +0200
commit62c339c5272ce8fbe8ca52695cee8ff40da7872e (patch)
tree9dfd84d9511a075a65e2969e286d0bfd7b9e70e4
parentf368c33d5ab09dd5656924185cd975b11838cd25 (diff)
downloadqemu-62c339c5272ce8fbe8ca52695cee8ff40da7872e.zip
qemu-62c339c5272ce8fbe8ca52695cee8ff40da7872e.tar.gz
qemu-62c339c5272ce8fbe8ca52695cee8ff40da7872e.tar.bz2
qemu-char: ignore flow control if a PTY's slave is not connected
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. Tested-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--qemu-char.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 7acc03f..956be49 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1168,6 +1168,9 @@ 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;
+ if (!s->connected) {
+ return NULL;
+ }
return g_io_create_watch(s->fd, cond);
}
@@ -3664,6 +3667,10 @@ int qemu_chr_fe_add_watch(CharDriverState *s, GIOCondition cond,
}
src = s->chr_add_watch(s, cond);
+ if (!src) {
+ return -EINVAL;
+ }
+
g_source_set_callback(src, (GSourceFunc)func, user_data, NULL);
tag = g_source_attach(src, NULL);
g_source_unref(src);