* [PULL 1/2] serial: poll the serial console with G_IO_HUP
2014-06-30 13:13 [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Paolo Bonzini
@ 2014-06-30 13:13 ` Paolo Bonzini
2014-06-30 13:13 ` [Qemu-devel] " Paolo Bonzini
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2014-06-30 13:13 UTC (permalink / raw)
To: qemu-devel
Cc: xen-devel, Peter Crosthwaite, Michael Tokarev,
Andreas Färber, Roger Pau Monne
From: Roger Pau Monne <roger.pau@citrix.com>
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é <roger.pau@citrix.com>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: "Andreas Färber" <afaerber@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: xen-devel@lists.xenproject.org
[Add hw/char/cadence_uart.c too. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [PULL 1/2] serial: poll the serial console with G_IO_HUP
2014-06-30 13:13 [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Paolo Bonzini
2014-06-30 13:13 ` [PULL 1/2] serial: poll the serial console with G_IO_HUP Paolo Bonzini
@ 2014-06-30 13:13 ` Paolo Bonzini
2014-06-30 13:13 ` [Qemu-devel] [PULL 2/2] tests/test-qmp-event: fix for GLib < 2.31 Paolo Bonzini
2014-06-30 15:13 ` [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2014-06-30 13:13 UTC (permalink / raw)
To: qemu-devel
Cc: xen-devel, Peter Crosthwaite, Michael Tokarev,
Andreas Färber, Roger Pau Monne
From: Roger Pau Monne <roger.pau@citrix.com>
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é <roger.pau@citrix.com>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: "Andreas Färber" <afaerber@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: xen-devel@lists.xenproject.org
[Add hw/char/cadence_uart.c too. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [PULL 2/2] tests/test-qmp-event: fix for GLib < 2.31
2014-06-30 13:13 [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Paolo Bonzini
2014-06-30 13:13 ` [PULL 1/2] serial: poll the serial console with G_IO_HUP Paolo Bonzini
2014-06-30 13:13 ` [Qemu-devel] " Paolo Bonzini
@ 2014-06-30 13:13 ` Paolo Bonzini
2014-06-30 15:13 ` [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2014-06-30 13:13 UTC (permalink / raw)
To: qemu-devel
On old GLib, the test needs a g_thread_init call.
Reported-by: Wenchao Xia <wenchaoqemu@gmail.com>
Tested-by: Wenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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 cb1e441..cb354e6 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);
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event
2014-06-30 13:13 [Qemu-devel] [PULL for-2.1 0/2] Small fixes for qemu-char and test-qmp-event Paolo Bonzini
` (2 preceding siblings ...)
2014-06-30 13:13 ` [Qemu-devel] [PULL 2/2] tests/test-qmp-event: fix for GLib < 2.31 Paolo Bonzini
@ 2014-06-30 15:13 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2014-06-30 15:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On 30 June 2014 14:13, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2014-06-29 18:09:51 +0100)
>
> are available in the git repository at:
>
>
> git://github.com/bonzini/qemu.git small-fixes
>
> for you to fetch changes up to af35e5e1fb8c334498c61cb9a568719483955a8f:
>
> tests/test-qmp-event: fix for GLib < 2.31 (2014-06-30 15:06:11 +0200)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread