Commit f74df9bf authored by Yuri Pudgorodskiy's avatar Yuri Pudgorodskiy Committed by Michael Roth
Browse files

qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all() 



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: default avatarYuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 4005b473

qga/channel-posix.c

+11 −12
Original line number Diff line number Diff line
@@ -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) {

    } while (status == G_IO_STATUS_AGAIN);



    if (status != G_IO_STATUS_NORMAL) {

        g_warning("error flushing channel: %s", err->message);

            return G_IO_STATUS_ERROR;

        }

    }



    return status;