[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] char: rename qemu_chr_read() -> qemu_chr_be_w
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 03/14] char: rename qemu_chr_read() -> qemu_chr_be_write() |
Date: |
Mon, 15 Aug 2011 11:17:30 -0500 |
Signed-off-by: Anthony Liguori <address@hidden>
---
console.c | 2 +-
gdbstub.c | 2 +-
hw/baum.c | 8 ++++----
hw/msmouse.c | 2 +-
qemu-char.c | 18 +++++++++---------
qemu-char.h | 2 +-
spice-qemu-char.c | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/console.c b/console.c
index 242086c..b831b6b 100644
--- a/console.c
+++ b/console.c
@@ -1130,7 +1130,7 @@ static void kbd_send_chars(void *opaque)
if (len > sizeof(buf))
len = sizeof(buf);
qemu_fifo_read(&s->out_fifo, buf, len);
- qemu_chr_read(s->chr, buf, len);
+ qemu_chr_be_write(s->chr, buf, len);
}
/* characters are pending: we send them a bit later (XXX:
horrible, should change char device API) */
diff --git a/gdbstub.c b/gdbstub.c
index d6c362e..058c626 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2194,7 +2194,7 @@ static int gdb_handle_packet(GDBState *s, const char
*line_buf)
hextomem(mem_buf, p + 5, len);
len = len / 2;
mem_buf[len++] = 0;
- qemu_chr_read(s->mon_chr, mem_buf, len);
+ qemu_chr_be_write(s->mon_chr, mem_buf, len);
put_packet(s, "OK");
break;
}
diff --git a/hw/baum.c b/hw/baum.c
index 33a22a7..efd9edb 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -231,12 +231,12 @@ static void baum_accept_input(struct CharDriverState *chr)
first = BUF_SIZE - baum->out_buf_ptr;
if (room > first) {
- qemu_chr_read(chr, baum->out_buf + baum->out_buf_ptr, first);
+ qemu_chr_be_write(chr, baum->out_buf + baum->out_buf_ptr, first);
baum->out_buf_ptr = 0;
baum->out_buf_used -= first;
room -= first;
}
- qemu_chr_read(chr, baum->out_buf + baum->out_buf_ptr, room);
+ qemu_chr_be_write(chr, baum->out_buf + baum->out_buf_ptr, room);
baum->out_buf_ptr += room;
baum->out_buf_used -= room;
}
@@ -254,12 +254,12 @@ static void baum_write_packet(BaumDriverState *baum,
const uint8_t *buf, int len
len = cur - io_buf;
if (len <= room) {
/* Fits */
- qemu_chr_read(baum->chr, io_buf, len);
+ qemu_chr_be_write(baum->chr, io_buf, len);
} else {
int first;
uint8_t out;
/* Can't fit all, send what can be, and store the rest. */
- qemu_chr_read(baum->chr, io_buf, room);
+ qemu_chr_be_write(baum->chr, io_buf, room);
len -= room;
cur = io_buf + room;
if (len > BUF_SIZE - baum->out_buf_used) {
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 67c6cd4..fbed80b 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -50,7 +50,7 @@ static void msmouse_event(void *opaque,
/* We always send the packet of, so that we do not have to keep track
of previous state of the middle button. This can potentially confuse
some very old drivers for two button mice though. */
- qemu_chr_read(chr, bytes, 4);
+ qemu_chr_be_write(chr, bytes, 4);
}
static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf,
int len)
diff --git a/qemu-char.c b/qemu-char.c
index 0e092fa..ad5a458 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -158,7 +158,7 @@ int qemu_chr_can_read(CharDriverState *s)
return s->chr_can_read(s->handler_opaque);
}
-void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len)
+void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len)
{
s->chr_read(s->handler_opaque, buf, len);
}
@@ -589,7 +589,7 @@ static void fd_chr_read(void *opaque)
return;
}
if (size > 0) {
- qemu_chr_read(chr, buf, size);
+ qemu_chr_be_write(chr, buf, size);
}
}
@@ -700,7 +700,7 @@ static int stdio_read_poll(void *opaque)
/* try to flush the queue if needed */
if (term_fifo_size != 0 && qemu_chr_can_read(chr) > 0) {
- qemu_chr_read(chr, term_fifo, 1);
+ qemu_chr_be_write(chr, term_fifo, 1);
term_fifo_size = 0;
}
/* see if we can absorb more chars */
@@ -725,7 +725,7 @@ static void stdio_read(void *opaque)
}
if (size > 0) {
if (qemu_chr_can_read(chr) > 0) {
- qemu_chr_read(chr, buf, 1);
+ qemu_chr_be_write(chr, buf, 1);
} else if (term_fifo_size == 0) {
term_fifo[term_fifo_size++] = buf[0];
}
@@ -914,7 +914,7 @@ static void pty_chr_read(void *opaque)
}
if (size > 0) {
pty_chr_state(chr, 1);
- qemu_chr_read(chr, buf, size);
+ qemu_chr_be_write(chr, buf, size);
}
}
@@ -1624,7 +1624,7 @@ static void win_chr_readfile(CharDriverState *chr)
}
if (size > 0) {
- qemu_chr_read(chr, buf, size);
+ qemu_chr_be_write(chr, buf, size);
}
}
@@ -1846,7 +1846,7 @@ static int udp_chr_read_poll(void *opaque)
* first
*/
while (s->max_size > 0 && s->bufptr < s->bufcnt) {
- qemu_chr_read(chr, &s->buf[s->bufptr], 1);
+ qemu_chr_be_write(chr, &s->buf[s->bufptr], 1);
s->bufptr++;
s->max_size = qemu_chr_can_read(chr);
}
@@ -1867,7 +1867,7 @@ static void udp_chr_read(void *opaque)
s->bufptr = 0;
while (s->max_size > 0 && s->bufptr < s->bufcnt) {
- qemu_chr_read(chr, &s->buf[s->bufptr], 1);
+ qemu_chr_be_write(chr, &s->buf[s->bufptr], 1);
s->bufptr++;
s->max_size = qemu_chr_can_read(chr);
}
@@ -2109,7 +2109,7 @@ static void tcp_chr_read(void *opaque)
if (s->do_telnetopt)
tcp_chr_process_IAC_bytes(chr, s, buf, &size);
if (size > 0)
- qemu_chr_read(chr, buf, size);
+ qemu_chr_be_write(chr, buf, size);
}
}
diff --git a/qemu-char.h b/qemu-char.h
index 72c457b..b16e566 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -97,7 +97,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
void qemu_chr_generic_open(CharDriverState *s);
int qemu_chr_can_read(CharDriverState *s);
-void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
+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);
int qemu_chr_add_client(CharDriverState *s, int fd);
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 95bf6b6..25f1508 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -39,7 +39,7 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const
uint8_t *buf, int len)
if (qemu_chr_can_read(scd->chr) < last_out) {
break;
}
- qemu_chr_read(scd->chr, p, last_out);
+ qemu_chr_be_write(scd->chr, p, last_out);
out += last_out;
len -= last_out;
p += last_out;
--
1.7.4.1
- [Qemu-devel] [PATCH 00/14] char: flow control part I, Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 01/14] char: rename qemu_chr_write() -> qemu_chr_fe_write(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 04/14] char: rename qemu_chr_can_read() -> qemu_chr_be_can_read(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 06/14] char: rename qemu_chr_guest_close() -> qemu_chr_fe_close(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 03/14] char: rename qemu_chr_read() -> qemu_chr_be_write(),
Anthony Liguori <=
- [Qemu-devel] [PATCH 08/14] char: rename qemu_chr_set_echo() -> qemu_chr_fe_set_echo(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 02/14] char: rename qemu_chr_printf() -> qemu_chr_fe_printf(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 07/14] char: qemu_chr_ioctl() -> qemu_chr_fe_ioctl(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 05/14] char: rename qemu_chr_guest_open() -> qemu_chr_fe_open(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 11/14] char: rename qemu_chr_close() -> qemu_chr_delete(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 10/14] char: qemu_chr_open_opts() -> qemu_chr_new_from_opts(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 13/14] char: remove qemu_chr_send_event(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 09/14] char: rename qemu_chr_open() -> qemu_chr_new(), Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 14/14] char: document the functions that will be the public interface, Anthony Liguori, 2011/08/15
- [Qemu-devel] [PATCH 12/14] char: rename qemu_chr_get_msgfd() -> qemu_chr_fe_get_msgfd(), Anthony Liguori, 2011/08/15