It was always only used for reads Signed-off-by: Juan Quintela <quint...@redhat.com> --- qemu-char.c | 4 ++-- qemu-char.h | 8 ++++---- qemu-common.h | 2 +- vl.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c index 4822209..5d8043a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -182,7 +182,7 @@ void qemu_chr_send_event(CharDriverState *s, int event) } void qemu_chr_add_handlers(CharDriverState *s, - IOCanRWHandler *fd_can_read, + IOCanReadHandler *fd_can_read, IOReadHandler *fd_read, IOEventHandler *fd_event, void *opaque) @@ -214,7 +214,7 @@ static CharDriverState *qemu_chr_open_null(QemuOpts *opts) #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ #define MUX_BUFFER_MASK (MUX_BUFFER_SIZE - 1) typedef struct { - IOCanRWHandler *chr_can_read[MAX_MUX]; + IOCanReadHandler *chr_can_read[MAX_MUX]; IOReadHandler *chr_read[MAX_MUX]; IOEventHandler *chr_event[MAX_MUX]; void *ext_opaque[MAX_MUX]; diff --git a/qemu-char.h b/qemu-char.h index ffc6cb6..9519332 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -57,7 +57,7 @@ struct CharDriverState { int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg); int (*get_msgfd)(struct CharDriverState *s); IOEventHandler *chr_event; - IOCanRWHandler *chr_can_read; + IOCanReadHandler *chr_can_read; IOReadHandler *chr_read; void *handler_opaque; void (*chr_send_event)(struct CharDriverState *chr, int event); @@ -79,7 +79,7 @@ void qemu_chr_printf(CharDriverState *s, const char *fmt, ...); int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len); void qemu_chr_send_event(CharDriverState *s, int event); void qemu_chr_add_handlers(CharDriverState *s, - IOCanRWHandler *fd_can_read, + IOCanReadHandler *fd_can_read, IOReadHandler *fd_read, IOEventHandler *fd_event, void *opaque); @@ -99,7 +99,7 @@ extern int term_escape_char; int qemu_clear_fd_handler(int fd); int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque); @@ -114,7 +114,7 @@ int qemu_set_fd_write_handler(int fd, IOHandler *fd_read, void *opaque); int qemu_set_fd_poll_handler(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, void *opaque); diff --git a/qemu-common.h b/qemu-common.h index 805be1a..42bfbcd 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -183,7 +183,7 @@ void QEMU_NORETURN hw_error(const char *fmt, ...) /* IO callbacks. */ typedef void IOReadHandler(void *opaque, const uint8_t *buf, int size); -typedef int IOCanRWHandler(void *opaque); +typedef int IOCanReadHandler(void *opaque); typedef void IOHandler(void *opaque); struct ParallelIOArg { diff --git a/vl.c b/vl.c index 2cb35dc..d774d39 100644 --- a/vl.c +++ b/vl.c @@ -2590,7 +2590,7 @@ void pcmcia_info(Monitor *mon) typedef struct IOHandlerRecord { int fd; - IOCanRWHandler *fd_read_poll; + IOCanReadHandler *fd_read_poll; IOHandler *fd_read; IOHandler *fd_write; int deleted; @@ -2619,7 +2619,7 @@ int qemu_clear_fd_handler(int fd) /* 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, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque) @@ -2685,7 +2685,7 @@ int qemu_set_fd_write_handler(int fd, } int qemu_set_fd_poll_handler(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, void *opaque) { -- 1.6.6.1