[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/16] migration: Teach it about G_SOURCE_REMOVE
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 02/16] migration: Teach it about G_SOURCE_REMOVE |
Date: |
Wed, 20 Sep 2017 12:46:25 +0200 |
As this is defined on glib 2.32, add compatibility macros for older glibs.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
include/glib-compat.h | 2 ++
migration/exec.c | 2 +-
migration/fd.c | 2 +-
migration/socket.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/glib-compat.h b/include/glib-compat.h
index fcffcd3f07..e15aca2d40 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -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
diff --git a/migration/exec.c b/migration/exec.c
index 08b599e0e2..f3be1baf2e 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -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)
diff --git a/migration/fd.c b/migration/fd.c
index 30f5258a6a..30de4b9847 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -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)
diff --git a/migration/socket.c b/migration/socket.c
index 757d3821a1..b02d37d7a3 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -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;
}
--
2.13.5
- [Qemu-devel] [PULL 00/16] Migration PULL request, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 02/16] migration: Teach it about G_SOURCE_REMOVE,
Juan Quintela <=
- [Qemu-devel] [PULL 04/16] migration: Create migration_has_all_channels, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 12/16] bitmap: provide to_le/from_le helpers, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 09/16] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 10/16] bitmap: remove BITOP_WORD(), Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 13/16] migration: pass MigrationIncomingState* into migration check functions, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 03/16] migration: Add comments to channel functions, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 05/16] migration: Add multifd capability, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 06/16] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 08/16] migration: Create multifd migration threads, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 01/16] migration: Create migration_ioc_process_incoming(), Juan Quintela, 2017/09/20