Commit 7b27a769 authored by Juan Quintela's avatar Juan Quintela Committed by Anthony Liguori
Browse files

rename IOCanRWHandler to IOCanReadHandler 



It was always only used for reads

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1c39e2a2

qemu-char.c

+2 −2
Original line number Diff line number Diff line
@@ -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];

qemu-char.h

+3 −4
Original line number Diff line number Diff line
@@ -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

qemu-common.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

qemu-tool.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

vl.c

+2 −2
Original line number Diff line number Diff line
@@ -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)