From 450880b49d3fae1c78d2efe102a47c90369dff49 Mon Sep 17 00:00:00 2001 Message-Id: <450880b49d3fae1c78d2efe102a47c90369dff49.1368111914.git.minovotn@redhat.com> 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:28 +0200 Subject: [PATCH 54/65] qemu-char: another io_add_watch_poll fix RH-Author: Amit Shah Message-id: <7bcd9d6eaf1d9b3766d305cbde53db73b7216ebe.1366724981.git.amit.shah@redhat.com> Patchwork-id: 50832 O-Subject: [RHEL6.5 qemu-kvm PATCH 54/65] qemu-char: another io_add_watch_poll fix Bugzilla: 909059 RH-Acked-by: Hans de Goede RH-Acked-by: Gerd Hoffmann RH-Acked-by: Paolo Bonzini From: Paolo Bonzini After attaching the source, we have to remove the reference we hold to it, because we do not hold anymore a pointer to the source. If we do not do this, removing the source will not finalize it and will not drop the "real" I/O watch source. This showed up when backporting the new flow control patches to older versions of QEMU that still used select. The whole select then failed with EBADF (poll instead will reporting POLLNVAL on a single pollfd) and QEMU froze. Signed-off-by: Paolo Bonzini Message-id: 1365600207-21685-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit 0ca5aa4f4c4a8bcc73988dd52a536241d35e5223) Signed-off-by: Amit Shah --- qemu-char.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Signed-off-by: Michal Novotny --- qemu-char.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index d23069d..222d46d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -610,6 +610,7 @@ static guint io_add_watch_poll(GIOChannel *channel, gpointer user_data) { IOWatchPoll *iwp; + int tag; iwp = (IOWatchPoll *) g_source_new(&io_watch_poll_funcs, sizeof(IOWatchPoll)); iwp->fd_can_read = fd_can_read; @@ -618,7 +619,9 @@ static guint io_add_watch_poll(GIOChannel *channel, iwp->fd_read = (GSourceFunc) fd_read; iwp->src = NULL; - return g_source_attach(&iwp->parent, NULL); + tag = g_source_attach(&iwp->parent, NULL); + g_source_unref(&iwp->parent); + return tag; } static GIOChannel *io_channel_from_fd(int fd) -- 1.7.11.7