From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2a-0006XH-EQ for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEY2T-00055g-Rg for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2T-00055b-KJ for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:29 -0400 From: Amit Shah Date: Wed, 28 Aug 2013 10:40:51 +0530 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach to dedup code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Paolo Bonzini , Gerd Hoffmann , Anthony Liguori , Hans de Goede Signed-off-by: Amit Shah --- qemu-char.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 2caab95..db256f8 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2514,10 +2514,7 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) if (s->listen_chan) { s->listen_tag = g_io_add_watch(s->listen_chan, G_IO_IN, tcp_chr_accept, chr); } - if (s->tag) { - io_remove_watch_poll(s->tag); - s->tag = 0; - } + tcp_chr_detach(chr); g_io_channel_unref(s->chan); s->chan = NULL; closesocket(s->fd); @@ -2630,10 +2627,7 @@ static void tcp_chr_close(CharDriverState *chr) { TCPCharDriver *s = chr->opaque; if (s->fd >= 0) { - if (s->tag) { - io_remove_watch_poll(s->tag); - s->tag = 0; - } + tcp_chr_detach(chr); if (s->chan) { g_io_channel_unref(s->chan); } -- 1.8.3.1