Re: [Qemu-devel] [PATCH v2 3/3] vhost-user-test: fix crash with glib < 2.36

[Michael S. Tsirkin]

On Mon, Nov 30, 2015 at 12:17:00PM +0100, address@hidden wrote:
> 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 | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index 29205ed..27dedeb 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -506,11 +506,20 @@ 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,
> -    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)

I don't see why do we need the ifdefs, we can use the
same code for all versions.
I queued a patch that does exactly that.

> -- 
> 2.5.0