haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vscclient: do not add a socket watch if there is not data to send

Browse source 
Fixes the following error:
** (process:780): CRITICAL **: do_socket_send: assertion
`socket_to_send->len != 0' failed

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2013-12-01 22:23:35 +01:00 committed by Gerd Hoffmann
parent f1d3e586f0
commit fa88afa51c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libcacard/vscclient.c
View file

@ -58,7 +58,7 @@ static QemuMutex socket_to_send_lock;
static guint socket_tag;
static void
update_socket_watch(gboolean out);
update_socket_watch(void);
static gboolean
do_socket_send(GIOChannel *source,
@ -80,7 +80,7 @@ do_socket_send(GIOChannel *source,
g_byte_array_remove_range(socket_to_send, 0, bw);
if (socket_to_send->len == 0) {
update_socket_watch(FALSE);
update_socket_watch();
return FALSE;
}
return TRUE;
@ -89,7 +89,7 @@ do_socket_send(GIOChannel *source,
static gboolean
socket_prepare_sending(gpointer user_data)
{
update_socket_watch(TRUE);
update_socket_watch();
return FALSE;
}
@ -440,8 +440,10 @@ do_socket(GIOChannel *source,
}
static void
update_socket_watch(gboolean out)
update_socket_watch(void)
{
gboolean out = socket_to_send->len > 0;
if (socket_tag != 0) {
g_source_remove(socket_tag);
}