mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
migration: Teach it about G_SOURCE_REMOVE
As this is defined on glib 2.32, add compatibility macros for older glibs. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
parent
4f0fae7f2b
commit
2a543bfdfa
|
@ -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);
|
return g_hash_table_lookup_extended(hash_table, key, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
#define G_SOURCE_CONTINUE TRUE
|
||||||
|
#define G_SOURCE_REMOVE FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef g_assert_true
|
#ifndef g_assert_true
|
||||||
|
|
|
@ -49,7 +49,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
|
||||||
{
|
{
|
||||||
migration_channel_process_incoming(ioc);
|
migration_channel_process_incoming(ioc);
|
||||||
object_unref(OBJECT(ioc));
|
object_unref(OBJECT(ioc));
|
||||||
return FALSE; /* unregister */
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exec_start_incoming_migration(const char *command, Error **errp)
|
void exec_start_incoming_migration(const char *command, Error **errp)
|
||||||
|
|
|
@ -49,7 +49,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
|
||||||
{
|
{
|
||||||
migration_channel_process_incoming(ioc);
|
migration_channel_process_incoming(ioc);
|
||||||
object_unref(OBJECT(ioc));
|
object_unref(OBJECT(ioc));
|
||||||
return FALSE; /* unregister */
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void fd_start_incoming_migration(const char *infd, Error **errp)
|
void fd_start_incoming_migration(const char *infd, Error **errp)
|
||||||
|
|
|
@ -154,7 +154,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
|
||||||
out:
|
out:
|
||||||
/* Close listening socket as its no longer needed */
|
/* Close listening socket as its no longer needed */
|
||||||
qio_channel_close(ioc, NULL);
|
qio_channel_close(ioc, NULL);
|
||||||
return FALSE; /* unregister */
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue