mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all()

Browse Source 
glib may return G_IO_STATUS_AGAIN which is actually not an error.
Also fixed a bug when on incomplete write buf pointer was not adjusted.

Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Yuri Pudgorodskiy 2015-10-13 18:41:22 +03:00 committed by Michael Roth
parent 4005b4732e
commit f74df9bfce
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qga/channel-posix.c
View File

@ -217,25 +217,24 @@ GIOStatus ga_channel_write_all(GAChannel *c, const gchar *buf, gsize size)
GIOStatus status = G_IO_STATUS_NORMAL; GIOStatus status = G_IO_STATUS_NORMAL;
while (size) { while (size) {
g_debug("sending data, count: %d", (int)size);
status = g_io_channel_write_chars(c->client_channel, buf, size, status = g_io_channel_write_chars(c->client_channel, buf, size,
&written, &err); &written, &err);
g_debug("sending data, count: %d", (int)size); if (status == G_IO_STATUS_NORMAL) {
if (err != NULL) { size -= written;
buf += written;
} else if (status != G_IO_STATUS_AGAIN) {
g_warning("error writing to channel: %s", err->message); g_warning("error writing to channel: %s", err->message);
return G_IO_STATUS_ERROR; return status;
} }
if (status != G_IO_STATUS_NORMAL) {
break;
}
size -= written;
} }
if (status == G_IO_STATUS_NORMAL) { do {
status = g_io_channel_flush(c->client_channel, &err); status = g_io_channel_flush(c->client_channel, &err);
if (err != NULL) { } while (status == G_IO_STATUS_AGAIN);
g_warning("error flushing channel: %s", err->message);
return G_IO_STATUS_ERROR; if (status != G_IO_STATUS_NORMAL) {
} g_warning("error flushing channel: %s", err->message);
} }
return status; return status;