mirror of https://github.com/xqemu/xqemu.git
char: rename qemu_chr_read() -> qemu_chr_be_write()
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
e7e71b0ec6
commit
fa5efccb2a
|
@ -1130,7 +1130,7 @@ static void kbd_send_chars(void *opaque)
|
||||||
if (len > sizeof(buf))
|
if (len > sizeof(buf))
|
||||||
len = sizeof(buf);
|
len = sizeof(buf);
|
||||||
qemu_fifo_read(&s->out_fifo, buf, len);
|
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:
|
/* characters are pending: we send them a bit later (XXX:
|
||||||
horrible, should change char device API) */
|
horrible, should change char device API) */
|
||||||
|
|
|
@ -2194,7 +2194,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
|
||||||
hextomem(mem_buf, p + 5, len);
|
hextomem(mem_buf, p + 5, len);
|
||||||
len = len / 2;
|
len = len / 2;
|
||||||
mem_buf[len++] = 0;
|
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");
|
put_packet(s, "OK");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,12 +231,12 @@ static void baum_accept_input(struct CharDriverState *chr)
|
||||||
|
|
||||||
first = BUF_SIZE - baum->out_buf_ptr;
|
first = BUF_SIZE - baum->out_buf_ptr;
|
||||||
if (room > first) {
|
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_ptr = 0;
|
||||||
baum->out_buf_used -= first;
|
baum->out_buf_used -= first;
|
||||||
room -= 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_ptr += room;
|
||||||
baum->out_buf_used -= 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;
|
len = cur - io_buf;
|
||||||
if (len <= room) {
|
if (len <= room) {
|
||||||
/* Fits */
|
/* Fits */
|
||||||
qemu_chr_read(baum->chr, io_buf, len);
|
qemu_chr_be_write(baum->chr, io_buf, len);
|
||||||
} else {
|
} else {
|
||||||
int first;
|
int first;
|
||||||
uint8_t out;
|
uint8_t out;
|
||||||
/* Can't fit all, send what can be, and store the rest. */
|
/* 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;
|
len -= room;
|
||||||
cur = io_buf + room;
|
cur = io_buf + room;
|
||||||
if (len > BUF_SIZE - baum->out_buf_used) {
|
if (len > BUF_SIZE - baum->out_buf_used) {
|
||||||
|
|
|
@ -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
|
/* 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
|
of previous state of the middle button. This can potentially confuse
|
||||||
some very old drivers for two button mice though. */
|
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)
|
static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int len)
|
||||||
|
|
18
qemu-char.c
18
qemu-char.c
|
@ -158,7 +158,7 @@ int qemu_chr_can_read(CharDriverState *s)
|
||||||
return s->chr_can_read(s->handler_opaque);
|
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);
|
s->chr_read(s->handler_opaque, buf, len);
|
||||||
}
|
}
|
||||||
|
@ -589,7 +589,7 @@ static void fd_chr_read(void *opaque)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (size > 0) {
|
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 */
|
/* 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_can_read(chr) > 0) {
|
||||||
qemu_chr_read(chr, term_fifo, 1);
|
qemu_chr_be_write(chr, term_fifo, 1);
|
||||||
term_fifo_size = 0;
|
term_fifo_size = 0;
|
||||||
}
|
}
|
||||||
/* see if we can absorb more chars */
|
/* see if we can absorb more chars */
|
||||||
|
@ -725,7 +725,7 @@ static void stdio_read(void *opaque)
|
||||||
}
|
}
|
||||||
if (size > 0) {
|
if (size > 0) {
|
||||||
if (qemu_chr_can_read(chr) > 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) {
|
} else if (term_fifo_size == 0) {
|
||||||
term_fifo[term_fifo_size++] = buf[0];
|
term_fifo[term_fifo_size++] = buf[0];
|
||||||
}
|
}
|
||||||
|
@ -914,7 +914,7 @@ static void pty_chr_read(void *opaque)
|
||||||
}
|
}
|
||||||
if (size > 0) {
|
if (size > 0) {
|
||||||
pty_chr_state(chr, 1);
|
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) {
|
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
|
* first
|
||||||
*/
|
*/
|
||||||
while (s->max_size > 0 && s->bufptr < s->bufcnt) {
|
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->bufptr++;
|
||||||
s->max_size = qemu_chr_can_read(chr);
|
s->max_size = qemu_chr_can_read(chr);
|
||||||
}
|
}
|
||||||
|
@ -1867,7 +1867,7 @@ static void udp_chr_read(void *opaque)
|
||||||
|
|
||||||
s->bufptr = 0;
|
s->bufptr = 0;
|
||||||
while (s->max_size > 0 && s->bufptr < s->bufcnt) {
|
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->bufptr++;
|
||||||
s->max_size = qemu_chr_can_read(chr);
|
s->max_size = qemu_chr_can_read(chr);
|
||||||
}
|
}
|
||||||
|
@ -2109,7 +2109,7 @@ static void tcp_chr_read(void *opaque)
|
||||||
if (s->do_telnetopt)
|
if (s->do_telnetopt)
|
||||||
tcp_chr_process_IAC_bytes(chr, s, buf, &size);
|
tcp_chr_process_IAC_bytes(chr, s, buf, &size);
|
||||||
if (size > 0)
|
if (size > 0)
|
||||||
qemu_chr_read(chr, buf, size);
|
qemu_chr_be_write(chr, buf, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
|
||||||
int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
|
int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
|
||||||
void qemu_chr_generic_open(CharDriverState *s);
|
void qemu_chr_generic_open(CharDriverState *s);
|
||||||
int qemu_chr_can_read(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);
|
int qemu_chr_get_msgfd(CharDriverState *s);
|
||||||
void qemu_chr_accept_input(CharDriverState *s);
|
void qemu_chr_accept_input(CharDriverState *s);
|
||||||
int qemu_chr_add_client(CharDriverState *s, int fd);
|
int qemu_chr_add_client(CharDriverState *s, int fd);
|
||||||
|
|
|
@ -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) {
|
if (qemu_chr_can_read(scd->chr) < last_out) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
qemu_chr_read(scd->chr, p, last_out);
|
qemu_chr_be_write(scd->chr, p, last_out);
|
||||||
out += last_out;
|
out += last_out;
|
||||||
len -= last_out;
|
len -= last_out;
|
||||||
p += last_out;
|
p += last_out;
|
||||||
|
|
Loading…
Reference in New Issue