summary refs log tree commit diff stats
path: root/hw/usb/redirect.c
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@citrix.com>2014-05-23 17:57:49 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-06-30 15:04:34 +0200
commite02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3 (patch)
tree248484486b6a64e6c79a4560bec751d6130ec505 /hw/usb/redirect.c
parent9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e (diff)
downloadfocaccia-qemu-e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3.tar.gz
focaccia-qemu-e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3.zip
serial: poll the serial console with G_IO_HUP
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>
Diffstat (limited to 'hw/usb/redirect.c')
-rw-r--r--hw/usb/redirect.c2
1 files changed, 1 insertions, 1 deletions
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) {