upstream: rename IOCanRWHandler into IOCanReadHandler
diff --git a/qemu-char-android.c b/qemu-char-android.c
index ca854b9..d67306a 100644
--- a/qemu-char-android.c
+++ b/qemu-char-android.c
@@ -199,7 +199,7 @@
}
void qemu_chr_add_handlers(CharDriverState *s,
- IOCanRWHandler *fd_can_read,
+ IOCanReadHandler *fd_can_read,
IOReadHandler *fd_read,
IOEventHandler *fd_event,
void *opaque)
@@ -231,7 +231,7 @@
#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.c b/qemu-char.c
index 5901faf..18e9ac0 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -191,7 +191,7 @@
}
void qemu_chr_add_handlers(CharDriverState *s,
- IOCanRWHandler *fd_can_read,
+ IOCanReadHandler *fd_can_read,
IOReadHandler *fd_read,
IOEventHandler *fd_event,
void *opaque)
@@ -223,7 +223,7 @@
#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 6e1c779..bf88af2 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -53,7 +53,7 @@
void (*chr_update_read_handler)(struct CharDriverState *s);
int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);
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);
@@ -73,7 +73,7 @@
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);
@@ -90,7 +90,7 @@
/* 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);
diff --git a/qemu-common.h b/qemu-common.h
index 366c002..73555e1 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -184,7 +184,7 @@
/* 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-android.c b/vl-android.c
index 291591b..44277ca 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -1913,7 +1913,7 @@
typedef struct IOHandlerRecord {
int fd;
- IOCanRWHandler *fd_read_poll;
+ IOCanReadHandler *fd_read_poll;
IOHandler *fd_read;
IOHandler *fd_write;
int deleted;
@@ -1928,7 +1928,7 @@
/* 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)
diff --git a/vl.c b/vl.c
index f86bf3c..fb06d05 100644
--- a/vl.c
+++ b/vl.c
@@ -1895,7 +1895,7 @@
typedef struct IOHandlerRecord {
int fd;
- IOCanRWHandler *fd_read_poll;
+ IOCanReadHandler *fd_read_poll;
IOHandler *fd_read;
IOHandler *fd_write;
int deleted;
@@ -1910,7 +1910,7 @@
/* 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)