From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvUMS-0008EI-Ef for qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvUMN-0007Ob-7y for qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35192) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dvUMN-0007OS-1c for qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:15:39 -0400 Date: Fri, 22 Sep 2017 21:15:33 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170922201532.GN2620@work-vm> References: <1504081950-2528-1-git-send-email-peterx@redhat.com> <1504081950-2528-31-git-send-email-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1504081950-2528-31-git-send-email-peterx@redhat.com> Subject: Re: [Qemu-devel] [RFC v2 30/33] migration: return incoming task tag for fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Laurent Vivier , "Daniel P . Berrange" , Alexey Perevalov , Juan Quintela , Andrea Arcangeli * Peter Xu (peterx@redhat.com) wrote: > Allow to return the task tag in fd_start_incoming_migration(). > > Signed-off-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert > --- > migration/fd.c | 18 +++++++++++------- > migration/fd.h | 2 +- > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/migration/fd.c b/migration/fd.c > index 30f5258..e9a548c 100644 > --- a/migration/fd.c > +++ b/migration/fd.c > @@ -52,7 +52,11 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc, > return FALSE; /* unregister */ > } > > -void fd_start_incoming_migration(const char *infd, Error **errp) > +/* > + * Returns the tag ID of the watch that is attached to global main > + * loop (>0), or zero if failure detected. > + */ > +guint fd_start_incoming_migration(const char *infd, Error **errp) > { > QIOChannel *ioc; > int fd; > @@ -63,13 +67,13 @@ void fd_start_incoming_migration(const char *infd, Error **errp) > ioc = qio_channel_new_fd(fd, errp); > if (!ioc) { > close(fd); > - return; > + return 0; > } > > qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming"); > - qio_channel_add_watch(ioc, > - G_IO_IN, > - fd_accept_incoming_migration, > - NULL, > - NULL); > + return qio_channel_add_watch(ioc, > + G_IO_IN, > + fd_accept_incoming_migration, > + NULL, > + NULL); > } > diff --git a/migration/fd.h b/migration/fd.h > index a14a63c..94cdea8 100644 > --- a/migration/fd.h > +++ b/migration/fd.h > @@ -16,7 +16,7 @@ > > #ifndef QEMU_MIGRATION_FD_H > #define QEMU_MIGRATION_FD_H > -void fd_start_incoming_migration(const char *path, Error **errp); > +guint fd_start_incoming_migration(const char *path, Error **errp); > > void fd_start_outgoing_migration(MigrationState *s, const char *fdname, > Error **errp); > -- > 2.7.4 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK