summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2015-11-30 17:44:49 +0100
committerMichael S. Tsirkin <mst@redhat.com>2015-12-02 16:42:26 +0200
commit45ce512670f34d10be34448e621fd1484bea0ec6 (patch)
treef62490c13673a5a7399db5dc21ebc6a6fa878cc1
parenta899b1ea2a6d6baa18f1c12da566aad35cb0d807 (diff)
downloadhqemu-45ce512670f34d10be34448e621fd1484bea0ec6.zip
hqemu-45ce512670f34d10be34448e621fd1484bea0ec6.tar.gz
vhost-user-test: fix crash with glib < 2.36
The prepare callback needs to be implemented with glib < 2.36, quoting glib documentation: "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." Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--tests/vhost-user-test.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 29205ed..29de739 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -506,11 +506,22 @@ test_migrate_source_check(GSource *source)
return FALSE;
}
+#if !GLIB_CHECK_VERSION(2,36,0)
+/* this callback is unnecessary with glib >2.36, the default
+ * prepare for the source does the same */
+static gboolean
+test_migrate_source_prepare(GSource *source, gint *timeout)
+{
+ *timeout = -1;
+ return FALSE;
+}
+#endif
+
GSourceFuncs test_migrate_source_funcs = {
- NULL,
- test_migrate_source_check,
- NULL,
- NULL
+#if !GLIB_CHECK_VERSION(2,36,0)
+ .prepare = test_migrate_source_prepare,
+#endif
+ .check = test_migrate_source_check,
};
static void test_migrate(void)
OpenPOWER on IntegriCloud