From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1bOZ-0006vu-17 for qemu-devel@nongnu.org; Mon, 30 Jun 2014 09:13:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1bOT-0007Nk-SB for qemu-devel@nongnu.org; Mon, 30 Jun 2014 09:13:18 -0400 Received: from mail-qg0-x229.google.com ([2607:f8b0:400d:c04::229]:62238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1bOT-0007NY-Mh for qemu-devel@nongnu.org; Mon, 30 Jun 2014 09:13:13 -0400 Received: by mail-qg0-f41.google.com with SMTP id i50so1948787qgf.14 for ; Mon, 30 Jun 2014 06:13:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 30 Jun 2014 15:13:02 +0200 Message-Id: <1404133983-30765-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1404133983-30765-1-git-send-email-pbonzini@redhat.com> References: <1404133983-30765-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 1/2] serial: poll the serial console with G_IO_HUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, Peter Crosthwaite , Michael Tokarev , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Roger Pau Monne From: Roger Pau Monne On FreeBSD polling a master pty while the other end is not connected with G_IO_OUT only results in an endless wait. This is different from the Linux behaviour, that returns immediately. In order to demonstrate this, I have the following example code: http://xenbits.xen.org/people/royger/test_poll.c When executed on Linux: $ ./test_poll In callback On FreeBSD instead, the callback never gets called: $ ./test_poll So, in order to workaround this, poll the source with G_IO_HUP (which makes the code behave the same way on both Linux and FreeBSD). Signed-off-by: Roger Pau Monné Cc: Peter Crosthwaite Cc: Michael Tokarev Cc: "Andreas Färber" Cc: Paolo Bonzini Cc: xen-devel@lists.xenproject.org [Add hw/char/cadence_uart.c too. - Paolo] Signed-off-by: Paolo Bonzini --- hw/char/cadence_uart.c | 3 ++- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 3 ++- hw/usb/redirect.c | 2 +- monitor.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index bf0c853..dbbc167 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -306,7 +306,8 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond, memmove(s->tx_fifo, s->tx_fifo + ret, s->tx_count); if (s->tx_count) { - int r = qemu_chr_fe_add_watch(s->chr, G_IO_OUT, cadence_uart_xmit, s); + int r = qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, + cadence_uart_xmit, s); assert(r); } diff --git a/hw/char/serial.c b/hw/char/serial.c index d17da16..54180a9 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -246,7 +246,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) serial_receive1(s, &s->tsr, 1); } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) != 1) { if (s->tsr_retry >= 0 && s->tsr_retry < MAX_XMIT_RETRY && - qemu_chr_fe_add_watch(s->chr, G_IO_OUT, serial_xmit, s) > 0) { + qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, serial_xmit, s) > 0) { s->tsr_retry++; return FALSE; } diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 54eb15f..752ed2c 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -70,7 +70,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, if (!k->is_console) { virtio_serial_throttle_port(port, true); if (!vcon->watch) { - vcon->watch = qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, + vcon->watch = qemu_chr_fe_add_watch(vcon->chr, + G_IO_OUT|G_IO_HUP, chr_write_unblocked, vcon); } } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 4c6187b..44522d9 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -290,7 +290,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count) r = qemu_chr_fe_write(dev->cs, data, count); if (r < count) { if (!dev->watch) { - dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT, + dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP, usbredir_write_unblocked, dev); } if (r < 0) { diff --git a/monitor.c b/monitor.c index 799131b..5bc70a6 100644 --- a/monitor.c +++ b/monitor.c @@ -321,7 +321,7 @@ static void monitor_flush_locked(Monitor *mon) mon->outbuf = tmp; } if (mon->out_watch == 0) { - mon->out_watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, + mon->out_watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT|G_IO_HUP, monitor_unblocked, mon); } } -- 1.9.3