From a558e69c4bdd0578ea571420c39238a5143022e8 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <405603258af5154387bea676be1f904b6713f6ae.1368111913.git.minovotn@redhat.com> References: <405603258af5154387bea676be1f904b6713f6ae.1368111913.git.minovotn@redhat.com> From: Amit Shah Date: Wed, 24 Apr 2013 08:18:34 +0200 Subject: [PATCH 60/65] qemu-char: use consistent idiom for removing sources RH-Author: Amit Shah Message-id: Patchwork-id: 50838 O-Subject: [RHEL6.5 qemu-kvm PATCH 60/65] qemu-char: use consistent idiom for removing sources Bugzilla: 909059 RH-Acked-by: Hans de Goede RH-Acked-by: Gerd Hoffmann RH-Acked-by: Paolo Bonzini From: Paolo Bonzini Always check that the source is active, and zero the tag afterwards. The occurrence in pty_chr_state will trigger with the next patch, the others are just theoretical. Signed-off-by: Paolo Bonzini Message-id: 1366385529-10329-2-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit 910b63682ea72f34307b8797c4cc81a1f2a0c47f) Signed-off-by: Amit Shah Conflicts: qemu-char.c --- qemu-char.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) Signed-off-by: Michal Novotny --- qemu-char.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 222d46d..dcee67e 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -591,9 +591,11 @@ static gboolean io_watch_poll_dispatch(GSource *source, GSourceFunc callback, static void io_watch_poll_finalize(GSource *source) { IOWatchPoll *iwp = io_watch_poll_from_source(source); - g_source_destroy(iwp->src); - g_source_unref(iwp->src); - iwp->src = NULL; + if (iwp->src) { + g_source_destroy(iwp->src); + g_source_unref(iwp->src); + iwp->src = NULL; + } } static GSourceFuncs io_watch_poll_funcs = { @@ -759,6 +761,7 @@ static void fd_chr_update_read_handler(CharDriverState *chr) if (s->fd_in_tag) { g_source_remove(s->fd_in_tag); + s->fd_in_tag = 0; } if (s->fd_in) { @@ -1093,8 +1096,10 @@ static void pty_chr_state(CharDriverState *chr, int connected) PtyCharDriver *s = chr->opaque; if (!connected) { - g_source_remove(s->fd_tag); - s->fd_tag = 0; + if (s->fd_tag) { + g_source_remove(s->fd_tag); + s->fd_tag = 0; + } s->connected = 0; s->polling = 0; /* (re-)connect poll interval for idle guests: once per second. @@ -1116,12 +1121,14 @@ static void pty_chr_close(struct CharDriverState *chr) if (s->fd_tag) { g_source_remove(s->fd_tag); + s->fd_tag = 0; } fd = g_io_channel_unix_get_fd(s->fd); g_io_channel_unref(s->fd); close(fd); if (s->timer_tag) { g_source_remove(s->timer_tag); + s->timer_tag = 0; } g_free(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); @@ -2046,6 +2053,7 @@ static void udp_chr_close(CharDriverState *chr) NetCharDriver *s = chr->opaque; if (s->tag) { g_source_remove(s->tag); + s->tag = 0; } if (s->chan) { g_io_channel_unref(s->chan); @@ -2270,8 +2278,10 @@ 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); } - g_source_remove(s->tag); - s->tag = 0; + if (s->tag) { + g_source_remove(s->tag); + s->tag = 0; + } g_io_channel_unref(s->chan); s->chan = NULL; closesocket(s->fd); @@ -2357,8 +2367,10 @@ static gboolean tcp_chr_accept(GIOChannel *channel, GIOCondition cond, void *opa socket_set_nodelay(fd); s->fd = fd; s->chan = io_channel_from_socket(fd); - g_source_remove(s->listen_tag); - s->listen_tag = 0; + if (s->listen_tag) { + g_source_remove(s->listen_tag); + s->listen_tag = 0; + } tcp_chr_connect(chr); return TRUE; @@ -2370,6 +2382,7 @@ static void tcp_chr_close(CharDriverState *chr) if (s->fd >= 0) { if (s->tag) { g_source_remove(s->tag); + s->tag = 0; } if (s->chan) { g_io_channel_unref(s->chan); @@ -2379,6 +2392,7 @@ static void tcp_chr_close(CharDriverState *chr) if (s->listen_fd >= 0) { if (s->listen_tag) { g_source_remove(s->listen_tag); + s->listen_tag = 0; } if (s->listen_chan) { g_io_channel_unref(s->listen_chan); -- 1.7.11.7