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