From patchwork Fri May 23 15:57:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 351948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E35951400A4 for ; Sat, 24 May 2014 02:06:34 +1000 (EST) Received: from localhost ([::1]:44623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrzM-00047K-AF for incoming@patchwork.ozlabs.org; Fri, 23 May 2014 12:06:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnryY-0002yh-Mn for qemu-devel@nongnu.org; Fri, 23 May 2014 12:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnryS-0006gf-Um for qemu-devel@nongnu.org; Fri, 23 May 2014 12:05:42 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:58390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnryS-0006gJ-Oj for qemu-devel@nongnu.org; Fri, 23 May 2014 12:05:36 -0400 X-IronPort-AV: E=Sophos;i="4.98,894,1392163200"; d="scan'208";a="134402481" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 23 May 2014 16:05:34 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Fri, 23 May 2014 12:05:33 -0400 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=FTLPEX01CL02.citrite.net) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Wnrr1-0005Iw-Q7; Fri, 23 May 2014 16:57:55 +0100 From: Roger Pau Monne To: , Date: Fri, 23 May 2014 17:57:49 +0200 Message-ID: <1400860669-21593-4-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1400860669-21593-1-git-send-email-roger.pau@citrix.com> References: <1400860669-21593-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Paolo Bonzini , Peter Crosthwaite , Michael Tokarev , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Roger Pau Monne Subject: [Qemu-devel] [PATCH v2 3/3] serial: poll the serial console with G_IO_HUP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- Changes since v1: - Fix other users of qemu_chr_fe_add_watch to use G_IO_HUP. --- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 3 ++- hw/usb/redirect.c | 2 +- monitor.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index f4d167f..2a2c9e5 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 6c8be0f..38e290a 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -69,7 +69,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 287a505..06e757d 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -284,7 +284,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 593679a..ae1c539 100644 --- a/monitor.c +++ b/monitor.c @@ -304,7 +304,7 @@ void monitor_flush(Monitor *mon) mon->outbuf = tmp; } if (mon->watch == 0) { - mon->watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, + mon->watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT|G_IO_HUP, monitor_unblocked, mon); } }