From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3RZe-0007o9-Or for qemu-devel@nongnu.org; Mon, 30 Nov 2015 11:45:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3RZY-0007j8-LA for qemu-devel@nongnu.org; Mon, 30 Nov 2015 11:45:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3RZY-0007iP-G4 for qemu-devel@nongnu.org; Mon, 30 Nov 2015 11:45:04 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 26B16DA7 for ; Mon, 30 Nov 2015 16:45:04 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Mon, 30 Nov 2015 17:44:49 +0100 Message-Id: <1448901890-17012-4-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1448901890-17012-1-git-send-email-marcandre.lureau@redhat.com> References: <1448901890-17012-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.5 v4 3/4] vhost-user-test: fix crash with glib < 2.36 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mst@redhat.com From: Marc-Andr=C3=A9 Lureau 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=C3=A9 Lureau --- 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; } =20 +#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 =3D -1; + return FALSE; +} +#endif + GSourceFuncs test_migrate_source_funcs =3D { - NULL, - test_migrate_source_check, - NULL, - NULL +#if !GLIB_CHECK_VERSION(2,36,0) + .prepare =3D test_migrate_source_prepare, +#endif + .check =3D test_migrate_source_check, }; =20 static void test_migrate(void) --=20 2.5.0