From patchwork Wed Aug 28 05:10:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 270337 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 945942C009E for ; Wed, 28 Aug 2013 15:17:33 +1000 (EST) Received: from localhost ([::1]:60423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY8J-0006eo-OV for incoming@patchwork.ozlabs.org; Wed, 28 Aug 2013 01:17:31 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7S5BSNJ031884 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Aug 2013 01:11:28 -0400 Received: from localhost (dhcp193-119.pnq.redhat.com [10.65.193.119]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7S5BQDT021556; Wed, 28 Aug 2013 01:11:27 -0400 From: Amit Shah To: qemu list Date: Wed, 28 Aug 2013 10:40:51 +0530 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Paolo Bonzini , Gerd Hoffmann , Anthony Liguori , Hans de Goede Subject: [Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach to dedup code 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 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); }