Commit 2a543bfd authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Teach it about G_SOURCE_REMOVE 



As this is defined on glib 2.32, add compatibility macros for older glibs.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
parent 4f0fae7f

include/glib-compat.h

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ static inline gboolean g_hash_table_contains(GHashTable *hash_table, 
{

    return g_hash_table_lookup_extended(hash_table, key, NULL, NULL);

}

#define G_SOURCE_CONTINUE TRUE

#define G_SOURCE_REMOVE FALSE

#endif



#ifndef g_assert_true

migration/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, 
{

    migration_channel_process_incoming(ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

    return G_SOURCE_REMOVE;

}



void exec_start_incoming_migration(const char *command, Error **errp)

migration/fd.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc, 
{

    migration_channel_process_incoming(ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

    return G_SOURCE_REMOVE;

}



void fd_start_incoming_migration(const char *infd, Error **errp)

migration/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, 
out:

    /* Close listening socket as its no longer needed */

    qio_channel_close(ioc, NULL);

    return FALSE; /* unregister */

    return G_SOURCE_REMOVE;

}