[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all() |
Date: |
Mon, 19 Oct 2015 18:38:17 -0500 |
From: Yuri Pudgorodskiy <address@hidden>
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 <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/channel-posix.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index 61aa3cb..50d9dd3 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -217,25 +217,24 @@ GIOStatus ga_channel_write_all(GAChannel *c, const gchar
*buf, gsize size)
GIOStatus status = G_IO_STATUS_NORMAL;
while (size) {
+ g_debug("sending data, count: %d", (int)size);
status = g_io_channel_write_chars(c->client_channel, buf, size,
&written, &err);
- g_debug("sending data, count: %d", (int)size);
- if (err != NULL) {
+ if (status == G_IO_STATUS_NORMAL) {
+ size -= written;
+ buf += written;
+ } else if (status != G_IO_STATUS_AGAIN) {
g_warning("error writing to channel: %s", err->message);
- return G_IO_STATUS_ERROR;
- }
- if (status != G_IO_STATUS_NORMAL) {
- break;
+ return status;
}
- size -= written;
}
- if (status == G_IO_STATUS_NORMAL) {
+ do {
status = g_io_channel_flush(c->client_channel, &err);
- if (err != NULL) {
- g_warning("error flushing channel: %s", err->message);
- return G_IO_STATUS_ERROR;
- }
+ } while (status == G_IO_STATUS_AGAIN);
+
+ if (status != G_IO_STATUS_NORMAL) {
+ g_warning("error flushing channel: %s", err->message);
}
return status;
--
1.9.1
- [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 09/14] qga: drop guest_file_init helper and replace it with static initializers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 10/14] qga: guest exec functionality, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all(),
Michael Roth <=
- [Qemu-devel] [PULL v4 13/14] qga: guest-exec simple stdin/stdout/stderr redirection, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 11/14] qga: handle possible SIGPIPE in guest-file-write, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 14/14] qga: fix uninitialized value warning for win32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 05/14] qtest: add a few fd-level qmp helpers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosity, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 01/14] build: qemu-ga: add 'qemu-ga' build target for w32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 02/14] qga: Use g_new() & friends where that makes obvious sense, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 06/14] glib-compat: add 2.38/2.40/2.46 asserts, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 08/14] tests: add a local test for guest agent, Michael Roth, 2015/10/19