[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/13] vscclient: do not add a socket watch if there
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 02/13] vscclient: do not add a socket watch if there is not data to send |
Date: |
Fri, 29 Nov 2013 15:58:33 +0100 |
From: Marc-André Lureau <address@hidden>
Fixes the following error:
** (process:780): CRITICAL **: do_socket_send: assertion
`socket_to_send->len != 0' failed
Signed-off-by: Marc-André Lureau <address@hidden>
---
libcacard/vscclient.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index a3cb776..c413a4f 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -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);
}
--
1.8.4.2
- [Qemu-devel] [PATCH 00/13] Spice block device, ready-to-go patches, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 01/13] coroutine: remove qemu_co_queue_wait_insert_head, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 02/13] vscclient: do not add a socket watch if there is not data to send,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 03/13] spice-char: remove unused field, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 04/13] qmp_change_blockdev() remove unused has_format, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 05/13] include: add missing config-host.h include, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 06/13] char: add qemu_chr_fe_event(), Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 07/13] spice-char: implement chardev port event, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 08/13] Split nbd block client code, Marc-André Lureau, 2013/11/29
- [Qemu-devel] [PATCH 09/13] nbd: don't change socket block during negotiate, Marc-André Lureau, 2013/11/29