From patchwork Tue Jul 1 11:52:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Batuzov X-Patchwork-Id: 366087 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 967481400AF for ; Tue, 1 Jul 2014 21:53:15 +1000 (EST) Received: from localhost ([::1]:46443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1wcb-0002dk-Ff for incoming@patchwork.ozlabs.org; Tue, 01 Jul 2014 07:53:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1wcE-0002Ia-Oi for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:52:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1wc9-00035X-T0 for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:52:50 -0400 Received: from smtp.ispras.ru ([83.149.199.79]:51065) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1wc9-00035K-Lm for qemu-devel@nongnu.org; Tue, 01 Jul 2014 07:52:45 -0400 Received: from bulbul.intra.ispras.ru (unknown [83.149.199.91]) by smtp.ispras.ru (Postfix) with ESMTP id CBE02224A7; Tue, 1 Jul 2014 15:52:42 +0400 (MSK) From: Kirill Batuzov To: qemu-devel@nongnu.org Date: Tue, 1 Jul 2014 15:52:32 +0400 Message-Id: <1404215552-12962-1-git-send-email-batuzovk@ispras.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20140527120423.15172.36698.stgit@3820> References: <20140527120423.15172.36698.stgit@3820> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.79 Cc: Nikita Belov , Antonios Motakis , "Michael S. Tsirkin" , Nikolay Nikolaev , Kirill Batuzov Subject: [Qemu-devel] [PATCH] Handle G_IO_HUP in tcp_chr_read for tcp chardev 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 Due to GLib limitations it is not possible to create several watches on one channel on Windows hosts. See bug #338943 in GNOME bugzilla for details: https://bugzilla.gnome.org/show_bug.cgi?id=338943 Handle G_IO_HUP in tcp_chr_read. It is already watched by corresponding watch. Also remove the second watch with its handler. This reverts commit cdaa86a54b232572bba594bf87a7416e527e460c. ("Add G_IO_HUP handler for socket chardev") but keeps its functionality. Cc: Antonios Motakis Cc: Nikolay Nikolaev Cc: Michael S. Tsirkin Signed-off-by: Kirill Batuzov Signed-off-by: Nikita Belov --- GLib limitation resulted in a bug on Windows host. Steps to reproduce: Start qemu: qemu-system-i386 -qmp tcp:127.0.0.1:4444:server:nowait Connect with telnet: telnet 127.0.0.1 4444 Try sending some data from telnet. Expected result: answers from QEMU. Observed result: no answers (actually tcp_chr_read is not called at all). --- include/sysemu/char.h | 1 - qemu-char.c | 27 ++++++--------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index c8b15f9..0bbd631 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -84,7 +84,6 @@ struct CharDriverState { int avail_connections; int is_mux; guint fd_in_tag; - guint fd_hup_tag; QemuOpts *opts; QTAILQ_ENTRY(CharDriverState) next; }; diff --git a/qemu-char.c b/qemu-char.c index 51917de..22a9777 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2673,6 +2673,12 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) uint8_t buf[READ_BUF_LEN]; int len, size; + if (cond & G_IO_HUP) { + /* connection closed */ + tcp_chr_disconnect(chr); + return TRUE; + } + if (!s->connected || s->max_size <= 0) { return TRUE; } @@ -2724,25 +2730,6 @@ CharDriverState *qemu_chr_open_eventfd(int eventfd) } #endif -static gboolean tcp_chr_chan_close(GIOChannel *channel, GIOCondition cond, - void *opaque) -{ - CharDriverState *chr = opaque; - - if (cond != G_IO_HUP) { - return FALSE; - } - - /* connection closed */ - tcp_chr_disconnect(chr); - if (chr->fd_hup_tag) { - g_source_remove(chr->fd_hup_tag); - chr->fd_hup_tag = 0; - } - - return TRUE; -} - static void tcp_chr_connect(void *opaque) { CharDriverState *chr = opaque; @@ -2752,8 +2739,6 @@ static void tcp_chr_connect(void *opaque) if (s->chan) { chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr); - chr->fd_hup_tag = g_io_add_watch(s->chan, G_IO_HUP, tcp_chr_chan_close, - chr); } qemu_chr_be_generic_open(chr); }