From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2X-0006Ry-ER for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEY2R-00054z-Ac for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2R-00054v-3I for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:27 -0400 From: Amit Shah Date: Wed, 28 Aug 2013 10:40:50 +0530 Message-Id: <01a44545ccfe5d75fbc2504d84a768a49b9ad5d0.1377666450.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 8/9] char: use the new udp_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 | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index d667e8c..2caab95 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2240,10 +2240,7 @@ static gboolean udp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) s->bufcnt = bytes_read; s->bufptr = s->bufcnt; if (status != G_IO_STATUS_NORMAL) { - if (s->tag) { - io_remove_watch_poll(s->tag); - s->tag = 0; - } + udp_chr_detach(chr); return FALSE; } @@ -2261,11 +2258,7 @@ static void udp_chr_update_read_handler(CharDriverState *chr) { NetCharDriver *s = chr->opaque; - if (s->tag) { - io_remove_watch_poll(s->tag); - s->tag = 0; - } - + udp_chr_detach(chr); if (s->chan) { s->tag = io_add_watch_poll(s->chan, udp_chr_read_poll, udp_chr_read, chr); } @@ -2274,10 +2267,8 @@ static void udp_chr_update_read_handler(CharDriverState *chr) static void udp_chr_close(CharDriverState *chr) { NetCharDriver *s = chr->opaque; - if (s->tag) { - io_remove_watch_poll(s->tag); - s->tag = 0; - } + + udp_chr_detach(chr); if (s->chan) { g_io_channel_unref(s->chan); closesocket(s->fd); -- 1.8.3.1