From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4E7h-0002VY-My for qemu-devel@nongnu.org; Wed, 02 Dec 2015 15:35:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4E7g-0002WW-Ld for qemu-devel@nongnu.org; Wed, 02 Dec 2015 15:35:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4E7g-0002WR-Bu for qemu-devel@nongnu.org; Wed, 02 Dec 2015 15:35:32 -0500 Date: Wed, 2 Dec 2015 22:35:28 +0200 From: "Michael S. Tsirkin" Message-ID: <1449088478-21099-4-git-send-email-mst@redhat.com> References: <1449088478-21099-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1449088478-21099-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/9] 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: Marcel Apfelbaum , Peter Maydell , Yuanhan Liu , Paolo Bonzini , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 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=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 MST