Update the fd code to use the new iohandler api. The change is mostly mechanical with a new iohandler function calling the older functions depending on the value of the 'mask' field.
Signed-off-by: Amit Shah <[email protected]> --- qemu-char.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 61f8358..d93820e 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -572,7 +572,7 @@ static void fd_chr_read(void *opaque) size = read(s->fd_in, buf, len); if (size == 0) { /* FD has been closed. Remove it from the active list. */ - qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL); + remove_iohandler(s->fd_in); qemu_chr_event(chr, CHR_EVENT_CLOSED); return; } @@ -581,6 +581,22 @@ static void fd_chr_read(void *opaque) } } +static int fd_iohandler(void *opaque, unsigned int mask) +{ + int ret; + + ret = 0; + switch(mask) { + case IOH_MASK_CAN_READ: + ret = fd_chr_read_poll(opaque); + break; + case IOH_MASK_READ: + fd_chr_read(opaque); + break; + } + return ret; +} + static void fd_chr_update_read_handler(CharDriverState *chr) { FDCharDriver *s = chr->opaque; @@ -588,8 +604,8 @@ static void fd_chr_update_read_handler(CharDriverState *chr) if (s->fd_in >= 0) { if (display_type == DT_NOGRAPHIC && s->fd_in == 0) { } else { - qemu_set_fd_handler2(s->fd_in, fd_chr_read_poll, - fd_chr_read, NULL, chr); + assign_iohandler(s->fd_in, fd_iohandler, + IOH_MASK_CAN_READ|IOH_MASK_READ, chr); } } } @@ -601,7 +617,7 @@ static void fd_chr_close(struct CharDriverState *chr) if (s->fd_in >= 0) { if (display_type == DT_NOGRAPHIC && s->fd_in == 0) { } else { - qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL); + remove_iohandler(s->fd_in); } } -- 1.7.4
