diff options
| author | Juan Quintela <quintela@redhat.com> | 2010-03-11 17:55:39 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-19 15:27:27 -0500 |
| commit | 7b27a769f139102c906c8d11d844d51dce068a6a (patch) | |
| tree | e0770a5a7d8fdf7c60c6fcca1bcfde4b2b7d7504 | |
| parent | 1c39e2a2e4f9a55065a58a28aa2457f80fc3073e (diff) | |
rename IOCanRWHandler to IOCanReadHandler
It was always only used for reads
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qemu-char.c | 4 | ||||
| -rw-r--r-- | qemu-char.h | 7 | ||||
| -rw-r--r-- | qemu-common.h | 2 | ||||
| -rw-r--r-- | qemu-tool.c | 2 | ||||
| -rw-r--r-- | vl.c | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/qemu-char.c b/qemu-char.c index 40cfefadd3..a3d6e64967 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 bcc07664d3..3a9427be67 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); @@ -98,7 +98,7 @@ extern int term_escape_char; /* async I/O support */ int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque); @@ -106,5 +106,4 @@ int qemu_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque); - #endif diff --git a/qemu-common.h b/qemu-common.h index 63aab46752..087c03472a 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -184,7 +184,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/qemu-tool.c b/qemu-tool.c index 97ca949964..dda752b7d2 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -89,7 +89,7 @@ void qemu_bh_delete(QEMUBH *bh) } int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque) @@ -1550,7 +1550,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; @@ -1567,7 +1567,7 @@ static QLIST_HEAD(, IOHandlerRecord) 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, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque) |