aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-10 15:23:27 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-15 10:22:05 -0500
commit0ca5aa4f4c4a8bcc73988dd52a536241d35e5223 (patch)
treec02cb9cab09792782229e9275d17fb8cc94d24d9
parentd5990ff46759d918309dc10409a7d7ee83467642 (diff)
downloadqemu-0ca5aa4f4c4a8bcc73988dd52a536241d35e5223.zip
qemu-0ca5aa4f4c4a8bcc73988dd52a536241d35e5223.tar.gz
qemu-0ca5aa4f4c4a8bcc73988dd52a536241d35e5223.tar.bz2
qemu-char: another io_add_watch_poll fix
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 <pbonzini@redhat.com> Message-id: 1365600207-21685-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-char.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c
index eae17fc..90cc1d6 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -663,6 +663,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;
@@ -671,7 +672,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;
}
#ifndef _WIN32