diff options
| author | Fam Zheng <famz@redhat.com> | 2015-06-04 14:45:19 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-06-12 13:26:21 +0100 |
| commit | 6484e422479c93f28e3f8a68258b0eacd3b31e6d (patch) | |
| tree | 3ffde15912aedf4f948ad8cbe7b2f0b3577e77f8 /iohandler.c | |
| parent | 82e1cc4bf91a2e1c3b62297b10b0ab1d93adfc45 (diff) | |
| download | focaccia-qemu-6484e422479c93f28e3f8a68258b0eacd3b31e6d.tar.gz focaccia-qemu-6484e422479c93f28e3f8a68258b0eacd3b31e6d.zip | |
main-loop: Drop qemu_set_fd_handler2
All users are converted to qemu_set_fd_handler now, drop qemu_set_fd_handler2 and IOHandlerRecord.fd_read_poll. Signed-off-by: Fam Zheng <famz@redhat.com> Message-id: 1433400324-7358-9-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'iohandler.c')
| -rw-r--r-- | iohandler.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/iohandler.c b/iohandler.c index cca614f087..d361cf2c03 100644 --- a/iohandler.c +++ b/iohandler.c @@ -33,7 +33,6 @@ #endif typedef struct IOHandlerRecord { - IOCanReadHandler *fd_read_poll; IOHandler *fd_read; IOHandler *fd_write; void *opaque; @@ -46,14 +45,10 @@ typedef struct IOHandlerRecord { static QLIST_HEAD(, IOHandlerRecord) io_handlers = QLIST_HEAD_INITIALIZER(io_handlers); - -/* XXX: fd_read_poll should be suppressed, but an API change is - necessary in the character devices to suppress fd_can_read(). */ -int qemu_set_fd_handler2(int fd, - IOCanReadHandler *fd_read_poll, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque) +int qemu_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque) { IOHandlerRecord *ioh; @@ -75,7 +70,6 @@ int qemu_set_fd_handler2(int fd, QLIST_INSERT_HEAD(&io_handlers, ioh, next); found: ioh->fd = fd; - ioh->fd_read_poll = fd_read_poll; ioh->fd_read = fd_read; ioh->fd_write = fd_write; ioh->opaque = opaque; @@ -86,14 +80,6 @@ int qemu_set_fd_handler2(int fd, return 0; } -int qemu_set_fd_handler(int fd, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque) -{ - return qemu_set_fd_handler2(fd, NULL, fd_read, fd_write, opaque); -} - void qemu_iohandler_fill(GArray *pollfds) { IOHandlerRecord *ioh; @@ -103,9 +89,7 @@ void qemu_iohandler_fill(GArray *pollfds) if (ioh->deleted) continue; - if (ioh->fd_read && - (!ioh->fd_read_poll || - ioh->fd_read_poll(ioh->opaque) != 0)) { + if (ioh->fd_read) { events |= G_IO_IN | G_IO_HUP | G_IO_ERR; } if (ioh->fd_write) { |