openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert io handlers to QLIST 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2010-03-11 17:55:37 +01:00 committed by Anthony Liguori
parent 77ac486263
commit 31d4ee6cf6
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vl.c
View File

@ -1557,10 +1557,12 @@ typedef struct IOHandlerRecord {
void *opaque; void *opaque;
/* temporary data */ /* temporary data */
struct pollfd *ufd; struct pollfd *ufd;
struct IOHandlerRecord *next; QLIST_ENTRY(IOHandlerRecord) next;
} IOHandlerRecord; } IOHandlerRecord;
static IOHandlerRecord *first_io_handler; static QLIST_HEAD(, IOHandlerRecord) io_handlers =
QLIST_HEAD_INITIALIZER(io_handlers);
/* XXX: fd_read_poll should be suppressed, but an API change is /* XXX: fd_read_poll should be suppressed, but an API change is
necessary in the character devices to suppress fd_can_read(). */ necessary in the character devices to suppress fd_can_read(). */
@ -1570,28 +1572,22 @@ int qemu_set_fd_handler2(int fd,
IOHandler *fd_write, IOHandler *fd_write,
void *opaque) void *opaque)
{ {
IOHandlerRecord **pioh, *ioh; IOHandlerRecord *ioh;
if (!fd_read && !fd_write) { if (!fd_read && !fd_write) {
pioh = &first_io_handler; QLIST_FOREACH(ioh, &io_handlers, next) {
for(;;) {
ioh = *pioh;
if (ioh == NULL)
break;
if (ioh->fd == fd) { if (ioh->fd == fd) {
ioh->deleted = 1; ioh->deleted = 1;
break; break;
} }
pioh = &ioh->next;
} }
} else { } else {
for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) { QLIST_FOREACH(ioh, &io_handlers, next) {
if (ioh->fd == fd) if (ioh->fd == fd)
goto found; goto found;
} }
ioh = qemu_mallocz(sizeof(IOHandlerRecord)); ioh = qemu_mallocz(sizeof(IOHandlerRecord));
ioh->next = first_io_handler; QLIST_INSERT_HEAD(&io_handlers, ioh, next);
first_io_handler = ioh;
found: found:
ioh->fd = fd; ioh->fd = fd;
ioh->fd_read_poll = fd_read_poll; ioh->fd_read_poll = fd_read_poll;
@ -2812,7 +2808,7 @@ void main_loop_wait(int nonblocking)
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_ZERO(&xfds); FD_ZERO(&xfds);
for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) { QLIST_FOREACH(ioh, &io_handlers, next) {
if (ioh->deleted) if (ioh->deleted)
continue; continue;
if (ioh->fd_read && if (ioh->fd_read &&
@ -2838,9 +2834,9 @@ void main_loop_wait(int nonblocking)
ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv); ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
if (ret > 0) { if (ret > 0) {
IOHandlerRecord **pioh; IOHandlerRecord *pioh;
for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) { QLIST_FOREACH(ioh, &io_handlers, next) {
if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) { if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
ioh->fd_read(ioh->opaque); ioh->fd_read(ioh->opaque);
} }
@ -2850,14 +2846,11 @@ void main_loop_wait(int nonblocking)
} }
/* remove deleted IO handlers */ /* remove deleted IO handlers */
pioh = &first_io_handler; QLIST_FOREACH_SAFE(ioh, &io_handlers, next, pioh) {
while (*pioh) {
ioh = *pioh;
if (ioh->deleted) { if (ioh->deleted) {
*pioh = ioh->next; QLIST_REMOVE(ioh, next);
qemu_free(ioh); qemu_free(ioh);
} else }
pioh = &ioh->next;
} }
} }