mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
Delete IOHandlers after potentially running them
Since commit 4bed983730
an .fd_read()
handler that deletes its IOHandler is exposed to .fd_write() being
called on the deleted IOHandler.
This patch fixes deletion so that .fd_read() and .fd_write() are never
called on an IOHandler that is marked for deletion.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
2cc59d8cb0
commit
0290b57bdf
15
vl.c
15
vl.c
|
@ -1249,16 +1249,17 @@ void main_loop_wait(int nonblocking)
|
|||
IOHandlerRecord *pioh;
|
||||
|
||||
QLIST_FOREACH_SAFE(ioh, &io_handlers, next, pioh) {
|
||||
if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
|
||||
ioh->fd_read(ioh->opaque);
|
||||
}
|
||||
if (!ioh->deleted && ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
|
||||
ioh->fd_write(ioh->opaque);
|
||||
}
|
||||
|
||||
/* Do this last in case read/write handlers marked it for deletion */
|
||||
if (ioh->deleted) {
|
||||
QLIST_REMOVE(ioh, next);
|
||||
qemu_free(ioh);
|
||||
continue;
|
||||
}
|
||||
if (ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
|
||||
ioh->fd_read(ioh->opaque);
|
||||
}
|
||||
if (ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
|
||||
ioh->fd_write(ioh->opaque);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue