diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-15 11:17:31 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-22 10:17:16 -0500 |
commit | 909cda12b57d8742d67470c5350ecc4012267cb2 (patch) | |
tree | 4722cec328a84a678ab595c2640782695cbac719 | |
parent | fa5efccb2a063f1dee46ed3ebd9192b318009f65 (diff) |
char: rename qemu_chr_can_read() -> qemu_chr_be_can_read()
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | console.c | 2 | ||||
-rw-r--r-- | hw/baum.c | 4 | ||||
-rw-r--r-- | qemu-char.c | 20 | ||||
-rw-r--r-- | qemu-char.h | 2 | ||||
-rw-r--r-- | spice-qemu-char.c | 2 |
5 files changed, 15 insertions, 15 deletions
@@ -1123,7 +1123,7 @@ static void kbd_send_chars(void *opaque) int len; uint8_t buf[16]; - len = qemu_chr_can_read(s->chr); + len = qemu_chr_be_can_write(s->chr); if (len > s->out_fifo.count) len = s->out_fifo.count; if (len > 0) { @@ -223,7 +223,7 @@ static void baum_accept_input(struct CharDriverState *chr) if (!baum->out_buf_used) return; - room = qemu_chr_can_read(chr); + room = qemu_chr_be_can_write(chr); if (!room) return; if (room > baum->out_buf_used) @@ -250,7 +250,7 @@ static void baum_write_packet(BaumDriverState *baum, const uint8_t *buf, int len while (len--) if ((*cur++ = *buf++) == ESC) *cur++ = ESC; - room = qemu_chr_can_read(baum->chr); + room = qemu_chr_be_can_write(baum->chr); len = cur - io_buf; if (len <= room) { /* Fits */ diff --git a/qemu-char.c b/qemu-char.c index 0786ab4e58..d3bfcafa49 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -151,7 +151,7 @@ int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg) return s->chr_ioctl(s, cmd, arg); } -int qemu_chr_can_read(CharDriverState *s) +int qemu_chr_be_can_write(CharDriverState *s) { if (!s->chr_can_read) return 0; @@ -565,7 +565,7 @@ static int fd_chr_read_poll(void *opaque) CharDriverState *chr = opaque; FDCharDriver *s = chr->opaque; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); return s->max_size; } @@ -699,7 +699,7 @@ static int stdio_read_poll(void *opaque) CharDriverState *chr = opaque; /* try to flush the queue if needed */ - if (term_fifo_size != 0 && qemu_chr_can_read(chr) > 0) { + if (term_fifo_size != 0 && qemu_chr_be_can_write(chr) > 0) { qemu_chr_be_write(chr, term_fifo, 1); term_fifo_size = 0; } @@ -724,7 +724,7 @@ static void stdio_read(void *opaque) return; } if (size > 0) { - if (qemu_chr_can_read(chr) > 0) { + if (qemu_chr_be_can_write(chr) > 0) { qemu_chr_be_write(chr, buf, 1); } else if (term_fifo_size == 0) { term_fifo[term_fifo_size++] = buf[0]; @@ -890,7 +890,7 @@ static int pty_chr_read_poll(void *opaque) CharDriverState *chr = opaque; PtyCharDriver *s = chr->opaque; - s->read_bytes = qemu_chr_can_read(chr); + s->read_bytes = qemu_chr_be_can_write(chr); return s->read_bytes; } @@ -1602,7 +1602,7 @@ static int win_chr_read_poll(CharDriverState *chr) { WinCharState *s = chr->opaque; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); return s->max_size; } @@ -1840,7 +1840,7 @@ static int udp_chr_read_poll(void *opaque) CharDriverState *chr = opaque; NetCharDriver *s = chr->opaque; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); /* If there were any stray characters in the queue process them * first @@ -1848,7 +1848,7 @@ static int udp_chr_read_poll(void *opaque) while (s->max_size > 0 && s->bufptr < s->bufcnt) { qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); s->bufptr++; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); } return s->max_size; } @@ -1869,7 +1869,7 @@ static void udp_chr_read(void *opaque) while (s->max_size > 0 && s->bufptr < s->bufcnt) { qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); s->bufptr++; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); } } @@ -1963,7 +1963,7 @@ static int tcp_chr_read_poll(void *opaque) TCPCharDriver *s = chr->opaque; if (!s->connected) return 0; - s->max_size = qemu_chr_can_read(chr); + s->max_size = qemu_chr_be_can_write(chr); return s->max_size; } diff --git a/qemu-char.h b/qemu-char.h index b16e566b10..3500a57d26 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -96,7 +96,7 @@ void qemu_chr_add_handlers(CharDriverState *s, void *opaque); int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg); void qemu_chr_generic_open(CharDriverState *s); -int qemu_chr_can_read(CharDriverState *s); +int qemu_chr_be_can_write(CharDriverState *s); void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len); int qemu_chr_get_msgfd(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); diff --git a/spice-qemu-char.c b/spice-qemu-char.c index f3e7702b55..a9323f39fb 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -36,7 +36,7 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len) while (len > 0) { last_out = MIN(len, VMC_MAX_HOST_WRITE); - if (qemu_chr_can_read(scd->chr) < last_out) { + if (qemu_chr_be_can_write(scd->chr) < last_out) { break; } qemu_chr_be_write(scd->chr, p, last_out); |