[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] vhost-user-test: fix crash with glib < 2.36
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH] vhost-user-test: fix crash with glib < 2.36 |
Date: |
Mon, 30 Nov 2015 13:01:51 +0200 |
glib manual says this about the prepare callback:
Since 2.36 this may be NULL, in which case the effect is as if the
function always returns FALSE with a timeout of -1.
Fix code to work for older glib - simply implement
a stub prepare callback.
While we are at it, switch to named initializers for
readability.
Reported-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/vhost-user-test.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 29205ed..b67ca56 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -506,11 +506,16 @@ test_migrate_source_check(GSource *source)
return FALSE;
}
+static gboolean
+test_migrate_source_prepare(GSource *source, gint *timeout)
+{
+ *timeout = -1;
+ return FALSE;
+}
+
GSourceFuncs test_migrate_source_funcs = {
- NULL,
- test_migrate_source_check,
- NULL,
- NULL
+ .prepare = test_migrate_source_prepare,
+ .check = test_migrate_source_check,
};
static void test_migrate(void)
--
MST
- [Qemu-devel] [PATCH] vhost-user-test: fix crash with glib < 2.36,
Michael S. Tsirkin <=