qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v2 3/3] vhost-user-test: fix crash with glib < 2.36


From: marcandre . lureau
Subject: [Qemu-devel] [PATCH v2 3/3] vhost-user-test: fix crash with glib < 2.36
Date: Mon, 30 Nov 2015 12:17:00 +0100

From: Marc-André Lureau <address@hidden>

The prepare callback needs to be implemented with glib < 2.36.

Signed-off-by: Marc-André Lureau <address@hidden>
---
 tests/vhost-user-test.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 29205ed..27dedeb 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -506,11 +506,20 @@ test_migrate_source_check(GSource *source)
     return FALSE;
 }
 
+#if !GLIB_CHECK_VERSION(2,36,0)
+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)
-- 
2.5.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]