[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib <
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36 |
Date: |
Fri, 27 Nov 2015 15:41:20 +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 | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 29205ed..4ab48e4 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -506,8 +506,19 @@ 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,
+#if !GLIB_CHECK_VERSION(2,36,0)
+ test_migrate_source_prepare,
+#endif
test_migrate_source_check,
NULL,
NULL
--
2.5.0
- [Qemu-devel] [PATCH for-2.5 0/3] vhost-user-test fixes, marcandre . lureau, 2015/11/27
- [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36,
marcandre . lureau <=
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Michael S. Tsirkin, 2015/11/30
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Marc-André Lureau, 2015/11/30
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Marc-André Lureau, 2015/11/30
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Michael S. Tsirkin, 2015/11/30
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Marc-André Lureau, 2015/11/30
- Re: [Qemu-devel] [PATCH for-2.5 3/3] vhost-user-test: fix crash with glib < 2.36, Michael S. Tsirkin, 2015/11/30
- [Qemu-devel] [PATCH for-2.5 2/3] vhost-user-test: use unix port for migration, marcandre . lureau, 2015/11/27
- [Qemu-devel] [PATCH for-2.5 1/3] vhost-user-test: fix chardriver race, marcandre . lureau, 2015/11/27