From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqMvc-0004tt-Pr for qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:18:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqMvW-0004vS-Tc for qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:18:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqMvW-0004uQ-Ld for qemu-devel@nongnu.org; Fri, 08 Sep 2017 13:18:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0F354E909 for ; Fri, 8 Sep 2017 17:18:45 +0000 (UTC) Date: Fri, 8 Sep 2017 18:18:40 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170908171839.GD2836@work-vm> References: <20170906115143.27451-1-quintela@redhat.com> <20170906115143.27451-4-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170906115143.27451-4-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v7 03/22] migration: Teach it about G_SOURCE_REMOVE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com * 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 > Reviewed-by: Daniel P. Berrange > Reviewed-by: Peter Xu 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