[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] vhost-user-test: fix crash with glib < 2.36
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 3/9] vhost-user-test: fix crash with glib < 2.36 |
Date: |
Wed, 2 Dec 2015 22:35:28 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/vhost-user-test.c | 19 +++++++++++++++----
1 file 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)
--
MST
- [Qemu-devel] [PULL 0/9] virtio,vhost,mmap fixes for 2.5, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 1/9] vhost-user-test: fix chardriver race, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 2/9] vhost-user-test: use unix port for migration, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 3/9] vhost-user-test: fix crash with glib < 2.36,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 4/9] vhost-user: verify that number of queues is non-zero, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 6/9] tests/vhost-user-bridge.c: fix fd leakage, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 5/9] vhost: drop dead code, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 7/9] virtio: handle non-virtio-1-capable backend for ccw, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 8/9] virtio-pci: Set the QEMU_PCI_CAP_EXPRESS capability early in its DeviceClass realize method, Michael S. Tsirkin, 2015/12/02
- [Qemu-devel] [PULL 9/9] util/mmap-alloc: fix hugetlb support on ppc64, Michael S. Tsirkin, 2015/12/02
- Re: [Qemu-devel] [PULL 0/9] virtio,vhost,mmap fixes for 2.5, Michael S. Tsirkin, 2015/12/02