mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-char: another io_add_watch_poll fix

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2013-04-10 15:23:27 +02:00 committed by Anthony Liguori
parent d5990ff467
commit 0ca5aa4f4c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qemu-char.c
View File

@ -663,6 +663,7 @@ static guint io_add_watch_poll(GIOChannel *channel,
gpointer user_data) gpointer user_data)
{ {
IOWatchPoll *iwp; IOWatchPoll *iwp;
int tag;
iwp = (IOWatchPoll *) g_source_new(&io_watch_poll_funcs, sizeof(IOWatchPoll)); iwp = (IOWatchPoll *) g_source_new(&io_watch_poll_funcs, sizeof(IOWatchPoll));
iwp->fd_can_read = fd_can_read; 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->fd_read = (GSourceFunc) fd_read;
iwp->src = NULL; 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 #ifndef _WIN32