mirror of https://github.com/proxmox/mirror_qemu
qemu-char: rewrite io_channel_send_all and drop the '_all' suffix
The current code is oddly written and have equally odd semantics. Despite the '_all' suffix, upon EAGAIN the result will be a partial write but instead of returning the partial write, we return EAGAIN. Change the behavior to write as much as we can until we get an EAGAIN returning a partial write if we do. Reported-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1364575190-731-1-git-send-email-aliguori@us.ibm.commaster
parent
d819cdccff
commit
684a096eaf
36
qemu-char.c
36
qemu-char.c
|
@ -727,33 +727,37 @@ static GIOChannel *io_channel_from_socket(int fd)
|
||||||
return chan;
|
return chan;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int io_channel_send_all(GIOChannel *fd, const void *_buf, int len1)
|
static int io_channel_send(GIOChannel *fd, const void *buf, size_t len)
|
||||||
{
|
{
|
||||||
GIOStatus status;
|
GIOStatus status;
|
||||||
gsize bytes_written;
|
size_t offset;
|
||||||
int len;
|
|
||||||
const uint8_t *buf = _buf;
|
|
||||||
|
|
||||||
len = len1;
|
offset = 0;
|
||||||
while (len > 0) {
|
while (offset < len) {
|
||||||
status = g_io_channel_write_chars(fd, (const gchar *)buf, len,
|
gsize bytes_written;
|
||||||
|
|
||||||
|
status = g_io_channel_write_chars(fd, buf + offset, len - offset,
|
||||||
&bytes_written, NULL);
|
&bytes_written, NULL);
|
||||||
if (status != G_IO_STATUS_NORMAL) {
|
if (status != G_IO_STATUS_NORMAL) {
|
||||||
if (status == G_IO_STATUS_AGAIN) {
|
if (status == G_IO_STATUS_AGAIN) {
|
||||||
|
/* If we've written any data, return a partial write. */
|
||||||
|
if (offset) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
errno = EAGAIN;
|
errno = EAGAIN;
|
||||||
return -1;
|
|
||||||
} else {
|
} else {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
} else if (status == G_IO_STATUS_EOF) {
|
} else if (status == G_IO_STATUS_EOF) {
|
||||||
break;
|
break;
|
||||||
} else {
|
|
||||||
buf += bytes_written;
|
|
||||||
len -= bytes_written;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
offset += bytes_written;
|
||||||
}
|
}
|
||||||
return len1 - len;
|
|
||||||
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
@ -770,7 +774,7 @@ static int fd_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
FDCharDriver *s = chr->opaque;
|
FDCharDriver *s = chr->opaque;
|
||||||
|
|
||||||
return io_channel_send_all(s->fd_out, buf, len);
|
return io_channel_send(s->fd_out, buf, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
|
static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
|
||||||
|
@ -1088,7 +1092,7 @@ static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
|
||||||
pty_chr_update_read_handler(chr);
|
pty_chr_update_read_handler(chr);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return io_channel_send_all(s->fd, buf, len);
|
return io_channel_send(s->fd, buf, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GSource *pty_chr_add_watch(CharDriverState *chr, GIOCondition cond)
|
static GSource *pty_chr_add_watch(CharDriverState *chr, GIOCondition cond)
|
||||||
|
@ -2347,7 +2351,7 @@ static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
TCPCharDriver *s = chr->opaque;
|
TCPCharDriver *s = chr->opaque;
|
||||||
if (s->connected) {
|
if (s->connected) {
|
||||||
return io_channel_send_all(s->chan, buf, len);
|
return io_channel_send(s->chan, buf, len);
|
||||||
} else {
|
} else {
|
||||||
/* XXX: indicate an error ? */
|
/* XXX: indicate an error ? */
|
||||||
return len;
|
return len;
|
||||||
|
|
Loading…
Reference in New Issue