Blame SOURCES/kvm-char-move-backends-io-watch-tag-to-CharDriverState.patch

218e99
From 418c81950cabb2c5b51060476396ddb0897ee2e7 Mon Sep 17 00:00:00 2001
218e99
From: Amit Shah <amit.shah@redhat.com>
218e99
Date: Tue, 8 Oct 2013 06:13:05 +0200
218e99
Subject: [PATCH 06/11] char: move backends' io watch tag to CharDriverState
218e99
218e99
RH-Author: Amit Shah <amit.shah@redhat.com>
218e99
Message-id: <425ec481c2ad94003f59ce6febaa1143fcf853e5.1381210228.git.amit.shah@redhat.com>
218e99
Patchwork-id: 54727
218e99
O-Subject: [RHEL7 qemu-kvm PATCH 1/3] char: move backends' io watch tag to CharDriverState
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
All the backends implement an io watcher tag for callbacks.  Move it to
218e99
CharDriverState from each backend's struct to make accessing the tag from
218e99
backend-neutral functions easier.
218e99
218e99
This will be used later to cancel a callback on chardev detach from a
218e99
frontend.
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
 include/sysemu/char.h |  1 +
218e99
 qemu-char.c           | 77 ++++++++++++++++++++++++++-------------------------
218e99
 2 files changed, 40 insertions(+), 38 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 include/sysemu/char.h |    1 +
218e99
 qemu-char.c           |   77 +++++++++++++++++++++++++------------------------
218e99
 2 files changed, 40 insertions(+), 38 deletions(-)
218e99
218e99
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
218e99
index ac2aaaf..f0ed280 100644
218e99
--- a/include/sysemu/char.h
218e99
+++ b/include/sysemu/char.h
218e99
@@ -78,6 +78,7 @@ struct CharDriverState {
218e99
     int explicit_be_open;
218e99
     int avail_connections;
218e99
     int is_mux;
218e99
+    guint fd_in_tag;
218e99
     QemuOpts *opts;
218e99
     QTAILQ_ENTRY(CharDriverState) next;
218e99
 };
218e99
diff --git a/qemu-char.c b/qemu-char.c
218e99
index 566267a..00cbf88 100644
218e99
--- a/qemu-char.c
218e99
+++ b/qemu-char.c
218e99
@@ -800,7 +800,6 @@ static int io_channel_send(GIOChannel *fd, const void *buf, size_t len)
218e99
 typedef struct FDCharDriver {
218e99
     CharDriverState *chr;
218e99
     GIOChannel *fd_in, *fd_out;
218e99
-    guint fd_in_tag;
218e99
     int max_size;
218e99
     QTAILQ_ENTRY(FDCharDriver) node;
218e99
 } FDCharDriver;
218e99
@@ -832,9 +831,9 @@ 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 (s->fd_in_tag) {
218e99
-            io_remove_watch_poll(s->fd_in_tag);
218e99
-            s->fd_in_tag = 0;
218e99
+        if (chr->fd_in_tag) {
218e99
+            io_remove_watch_poll(chr->fd_in_tag);
218e99
+            chr->fd_in_tag = 0;
218e99
         }
218e99
         qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
218e99
         return FALSE;
218e99
@@ -865,13 +864,14 @@ static void fd_chr_update_read_handler(CharDriverState *chr)
218e99
 {
218e99
     FDCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (s->fd_in_tag) {
218e99
-        io_remove_watch_poll(s->fd_in_tag);
218e99
-        s->fd_in_tag = 0;
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
     }
218e99
 
218e99
     if (s->fd_in) {
218e99
-        s->fd_in_tag = io_add_watch_poll(s->fd_in, fd_chr_read_poll, fd_chr_read, chr);
218e99
+        chr->fd_in_tag = io_add_watch_poll(s->fd_in, fd_chr_read_poll,
218e99
+                                           fd_chr_read, chr);
218e99
     }
218e99
 }
218e99
 
218e99
@@ -879,9 +879,9 @@ static void fd_chr_close(struct CharDriverState *chr)
218e99
 {
218e99
     FDCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (s->fd_in_tag) {
218e99
-        io_remove_watch_poll(s->fd_in_tag);
218e99
-        s->fd_in_tag = 0;
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
     }
218e99
 
218e99
     if (s->fd_in) {
218e99
@@ -1016,7 +1016,6 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
218e99
 
218e99
 typedef struct {
218e99
     GIOChannel *fd;
218e99
-    guint fd_tag;
218e99
     int connected;
218e99
     int read_bytes;
218e99
     guint timer_tag;
218e99
@@ -1131,9 +1130,9 @@ static void pty_chr_state(CharDriverState *chr, int connected)
218e99
     PtyCharDriver *s = chr->opaque;
218e99
 
218e99
     if (!connected) {
218e99
-        if (s->fd_tag) {
218e99
-            io_remove_watch_poll(s->fd_tag);
218e99
-            s->fd_tag = 0;
218e99
+        if (chr->fd_in_tag) {
218e99
+            io_remove_watch_poll(chr->fd_in_tag);
218e99
+            chr->fd_in_tag = 0;
218e99
         }
218e99
         s->connected = 0;
218e99
         /* (re-)connect poll interval for idle guests: once per second.
218e99
@@ -1148,7 +1147,8 @@ static void pty_chr_state(CharDriverState *chr, int connected)
218e99
         if (!s->connected) {
218e99
             s->connected = 1;
218e99
             qemu_chr_be_generic_open(chr);
218e99
-            s->fd_tag = io_add_watch_poll(s->fd, pty_chr_read_poll, pty_chr_read, chr);
218e99
+            chr->fd_in_tag = io_add_watch_poll(s->fd, pty_chr_read_poll,
218e99
+                                               pty_chr_read, chr);
218e99
         }
218e99
     }
218e99
 }
218e99
@@ -1159,9 +1159,9 @@ static void pty_chr_close(struct CharDriverState *chr)
218e99
     PtyCharDriver *s = chr->opaque;
218e99
     int fd;
218e99
 
218e99
-    if (s->fd_tag) {
218e99
-        io_remove_watch_poll(s->fd_tag);
218e99
-        s->fd_tag = 0;
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
     }
218e99
     fd = g_io_channel_unix_get_fd(s->fd);
218e99
     g_io_channel_unref(s->fd);
218e99
@@ -2169,7 +2169,6 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
218e99
 typedef struct {
218e99
     int fd;
218e99
     GIOChannel *chan;
218e99
-    guint tag;
218e99
     uint8_t buf[READ_BUF_LEN];
218e99
     int bufcnt;
218e99
     int bufptr;
218e99
@@ -2225,9 +2224,9 @@ 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 (s->tag) {
218e99
-            io_remove_watch_poll(s->tag);
218e99
-            s->tag = 0;
218e99
+        if (chr->fd_in_tag) {
218e99
+            io_remove_watch_poll(chr->fd_in_tag);
218e99
+            chr->fd_in_tag = 0;
218e99
         }
218e99
         return FALSE;
218e99
     }
218e99
@@ -2246,22 +2245,23 @@ static void udp_chr_update_read_handler(CharDriverState *chr)
218e99
 {
218e99
     NetCharDriver *s = chr->opaque;
218e99
 
218e99
-    if (s->tag) {
218e99
-        io_remove_watch_poll(s->tag);
218e99
-        s->tag = 0;
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
     }
218e99
 
218e99
     if (s->chan) {
218e99
-        s->tag = io_add_watch_poll(s->chan, udp_chr_read_poll, udp_chr_read, chr);
218e99
+        chr->fd_in_tag = io_add_watch_poll(s->chan, udp_chr_read_poll,
218e99
+                                           udp_chr_read, chr);
218e99
     }
218e99
 }
218e99
 
218e99
 static void udp_chr_close(CharDriverState *chr)
218e99
 {
218e99
     NetCharDriver *s = chr->opaque;
218e99
-    if (s->tag) {
218e99
-        io_remove_watch_poll(s->tag);
218e99
-        s->tag = 0;
218e99
+    if (chr->fd_in_tag) {
218e99
+        io_remove_watch_poll(chr->fd_in_tag);
218e99
+        chr->fd_in_tag = 0;
218e99
     }
218e99
     if (s->chan) {
218e99
         g_io_channel_unref(s->chan);
218e99
@@ -2310,7 +2310,7 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
218e99
 typedef struct {
218e99
 
218e99
     GIOChannel *chan, *listen_chan;
218e99
-    guint tag, listen_tag;
218e99
+    guint listen_tag;
218e99
     int fd, listen_fd;
218e99
     int connected;
218e99
     int max_size;
218e99
@@ -2495,9 +2495,9 @@ 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 (s->tag) {
218e99
-            io_remove_watch_poll(s->tag);
218e99
-            s->tag = 0;
218e99
+        if (chr->fd_in_tag) {
218e99
+            io_remove_watch_poll(chr->fd_in_tag);
218e99
+            chr->fd_in_tag = 0;
218e99
         }
218e99
         g_io_channel_unref(s->chan);
218e99
         s->chan = NULL;
218e99
@@ -2528,7 +2528,8 @@ static void tcp_chr_connect(void *opaque)
218e99
 
218e99
     s->connected = 1;
218e99
     if (s->chan) {
218e99
-        s->tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr);
218e99
+        chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll,
218e99
+                                           tcp_chr_read, chr);
218e99
     }
218e99
     qemu_chr_be_generic_open(chr);
218e99
 }
218e99
@@ -2611,9 +2612,9 @@ static void tcp_chr_close(CharDriverState *chr)
218e99
 {
218e99
     TCPCharDriver *s = chr->opaque;
218e99
     if (s->fd >= 0) {
218e99
-        if (s->tag) {
218e99
-            io_remove_watch_poll(s->tag);
218e99
-            s->tag = 0;
218e99
+        if (chr->fd_in_tag) {
218e99
+            io_remove_watch_poll(chr->fd_in_tag);
218e99
+            chr->fd_in_tag = 0;
218e99
         }
218e99
         if (s->chan) {
218e99
             g_io_channel_unref(s->chan);
218e99
-- 
218e99
1.7.1
218e99