Commit 45ce5126 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

vhost-user-test: fix crash with glib < 2.36 



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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a899b1ea

tests/vhost-user-test.c

+15 −4
Original line number Diff line number Diff line
@@ -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)