218e99
From a553f55610d9c5f016aefc8cc2914c769664ef53 Mon Sep 17 00:00:00 2001
218e99
From: Amit Shah <amit.shah@redhat.com>
218e99
Date: Tue, 8 Oct 2013 06:13:06 +0200
218e99
Subject: [PATCH 07/11] char: use common function to disable callbacks on chardev close
218e99
218e99
RH-Author: Amit Shah <amit.shah@redhat.com>
218e99
Message-id: <50da0ea80f5257a98f27567ce2bbd987355f795e.1381210228.git.amit.shah@redhat.com>
218e99
Patchwork-id: 54728
218e99
O-Subject: [RHEL7 qemu-kvm PATCH 2/3] char: use common function to disable callbacks on chardev close
218e99
Bugzilla: 1007222
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
218e99
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
218e99
218e99
This deduplicates code used a lot of times.
218e99
218e99
CC: <qemu-stable@nongnu.org>
218e99
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
218e99
Signed-off-by: Amit Shah <amit.shah@redhat.com>
218e99
---
218e99
 qemu-char.c | 62 +++++++++++++++++++------------------------------------------
218e99
 1 file changed, 19 insertions(+), 43 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 qemu-char.c |   62 ++++++++++++++++++----------------------------------------
218e99
 1 files changed, 19 insertions(+), 43 deletions(-)
218e99
218e99
diff --git a/qemu-char.c b/qemu-char.c
218e99
index 00cbf88..8d46f98 100644
218e99
--- a/qemu-char.c
218e99
+++ b/qemu-char.c
218e99
@@ -727,6 +727,14 @@ static void io_remove_watch_poll(guint tag)
218e99
     g_source_destroy(&iwp->parent);
218e99
 }
218e99
 
218e99
+static void remove_fd_in_watch(CharDriverState *chr)
218e99
+{
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
+    }
218e99
+}
218e99
+
218e99
 #ifndef _WIN32
218e99
 static GIOChannel *io_channel_from_fd(int fd)
218e99
 {
218e99
@@ -831,10 +839,7 @@ static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
218e99
     status = g_io_channel_read_chars(chan, (gchar *)buf,
218e99
                                      len, &bytes_read, NULL);
218e99
     if (status == G_IO_STATUS_EOF) {
218e99
-        if (chr->fd_in_tag) {
218e99
-            io_remove_watch_poll(chr->fd_in_tag);
218e99
-            chr->fd_in_tag = 0;
218e99
-        }
218e99
+        remove_fd_in_watch(chr);
218e99
         qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
218e99
         return FALSE;
218e99
     }
218e99
@@ -864,11 +869,7 @@ static void fd_chr_update_read_handler(CharDriverState *chr)
218e99
 {
218e99
     FDCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (chr->fd_in_tag) {
218e99
-        io_remove_watch_poll(chr->fd_in_tag);
218e99
-        chr->fd_in_tag = 0;
218e99
-    }
218e99
-
218e99
+    remove_fd_in_watch(chr);
218e99
     if (s->fd_in) {
218e99
         chr->fd_in_tag = io_add_watch_poll(s->fd_in, fd_chr_read_poll,
218e99
                                            fd_chr_read, chr);
218e99
@@ -879,11 +880,7 @@ static void fd_chr_close(struct CharDriverState *chr)
218e99
 {
218e99
     FDCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (chr->fd_in_tag) {
218e99
-        io_remove_watch_poll(chr->fd_in_tag);
218e99
-        chr->fd_in_tag = 0;
218e99
-    }
218e99
-
218e99
+    remove_fd_in_watch(chr);
218e99
     if (s->fd_in) {
218e99
         g_io_channel_unref(s->fd_in);
218e99
     }
218e99
@@ -1130,10 +1127,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
218e99
     PtyCharDriver *s = chr->opaque;
218e99
 
218e99
     if (!connected) {
218e99
-        if (chr->fd_in_tag) {
218e99
-            io_remove_watch_poll(chr->fd_in_tag);
218e99
-            chr->fd_in_tag = 0;
218e99
-        }
218e99
+        remove_fd_in_watch(chr);
218e99
         s->connected = 0;
218e99
         /* (re-)connect poll interval for idle guests: once per second.
218e99
          * We check more frequently in case the guests sends data to
218e99
@@ -1159,10 +1153,7 @@ static void pty_chr_close(struct CharDriverState *chr)
218e99
     PtyCharDriver *s = chr->opaque;
218e99
     int fd;
218e99
 
218e99
-    if (chr->fd_in_tag) {
218e99
-        io_remove_watch_poll(chr->fd_in_tag);
218e99
-        chr->fd_in_tag = 0;
218e99
-    }
218e99
+    remove_fd_in_watch(chr);
218e99
     fd = g_io_channel_unix_get_fd(s->fd);
218e99
     g_io_channel_unref(s->fd);
218e99
     close(fd);
218e99
@@ -2224,10 +2215,7 @@ static gboolean udp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
218e99
     s->bufcnt = bytes_read;
218e99
     s->bufptr = s->bufcnt;
218e99
     if (status != G_IO_STATUS_NORMAL) {
218e99
-        if (chr->fd_in_tag) {
218e99
-            io_remove_watch_poll(chr->fd_in_tag);
218e99
-            chr->fd_in_tag = 0;
218e99
-        }
218e99
+        remove_fd_in_watch(chr);
218e99
         return FALSE;
218e99
     }
218e99
 
218e99
@@ -2245,11 +2233,7 @@ static void udp_chr_update_read_handler(CharDriverState *chr)
218e99
 {
218e99
     NetCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (chr->fd_in_tag) {
218e99
-        io_remove_watch_poll(chr->fd_in_tag);
218e99
-        chr->fd_in_tag = 0;
218e99
-    }
218e99
-
218e99
+    remove_fd_in_watch(chr);
218e99
     if (s->chan) {
218e99
         chr->fd_in_tag = io_add_watch_poll(s->chan, udp_chr_read_poll,
218e99
                                            udp_chr_read, chr);
218e99
@@ -2259,10 +2243,8 @@ static void udp_chr_update_read_handler(CharDriverState *chr)
218e99
 static void udp_chr_close(CharDriverState *chr)
218e99
 {
218e99
     NetCharDriver *s = chr->opaque;
218e99
-    if (chr->fd_in_tag) {
218e99
-        io_remove_watch_poll(chr->fd_in_tag);
218e99
-        chr->fd_in_tag = 0;
218e99
-    }
218e99
+
218e99
+    remove_fd_in_watch(chr);
218e99
     if (s->chan) {
218e99
         g_io_channel_unref(s->chan);
218e99
         closesocket(s->fd);
218e99
@@ -2495,10 +2477,7 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
218e99
         if (s->listen_chan) {
218e99
             s->listen_tag = g_io_add_watch(s->listen_chan, G_IO_IN, tcp_chr_accept, chr);
218e99
         }
218e99
-        if (chr->fd_in_tag) {
218e99
-            io_remove_watch_poll(chr->fd_in_tag);
218e99
-            chr->fd_in_tag = 0;
218e99
-        }
218e99
+        remove_fd_in_watch(chr);
218e99
         g_io_channel_unref(s->chan);
218e99
         s->chan = NULL;
218e99
         closesocket(s->fd);
218e99
@@ -2612,10 +2591,7 @@ static void tcp_chr_close(CharDriverState *chr)
218e99
 {
218e99
     TCPCharDriver *s = chr->opaque;
218e99
     if (s->fd >= 0) {
218e99
-        if (chr->fd_in_tag) {
218e99
-            io_remove_watch_poll(chr->fd_in_tag);
218e99
-            chr->fd_in_tag = 0;
218e99
-        }
218e99
+        remove_fd_in_watch(chr);
218e99
         if (s->chan) {
218e99
             g_io_channel_unref(s->chan);
218e99
         }
218e99
-- 
218e99
1.7.1
218e99