From e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 23 May 2014 17:57:49 +0200 Subject: [PATCH 1/2] 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 ++- 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 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); } diff --git a/hw/char/serial.c b/hw/char/serial.c index d17da1654c..54180a9cba 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 54eb15f3af..752ed2c3c8 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 4c6187bebd..44522d9005 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 799131bd01..5bc70a642d 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); } } From af35e5e1fb8c334498c61cb9a568719483955a8f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 30 Jun 2014 15:05:49 +0200 Subject: [PATCH 2/2] tests/test-qmp-event: fix for GLib < 2.31 On old GLib, the test needs a g_thread_init call. Reported-by: Wenchao Xia Tested-by: Wenchao Xia Signed-off-by: Paolo Bonzini --- tests/test-qmp-event.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index cb1e4418ec..cb354e6e81 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -251,6 +251,12 @@ static void test_event_d(TestEventData *data, int main(int argc, char **argv) { +#if !GLIB_CHECK_VERSION(2, 31, 0) + if (!g_thread_supported()) { + g_thread_init(NULL); + } +#endif + qmp_event_set_func_emit(event_test_emit); g_test_init(&argc, &argv, NULL);