| Message ID | 20170906115143.27451-4-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multifd | expand |
* Juan Quintela (quintela@redhat.com) wrote: > 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> I think 03 and 04 could both be merged to current qemu? I think you could remove the G_SOURCE_CONTINUE/REMOVE defines in contrib/vhost-user-scsi/vhost-user-scsi.c as well. Dave > --- > 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 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
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; }