From e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 23 May 2014 17:57:49 +0200 Subject: serial: poll the serial console with G_IO_HUP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/char/cadence_uart.c') diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index bf0c853499..dbbc167425 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); } -- cgit 1.4.1