From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3zHo-0001c8-S7 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3zHo-0002xS-4T for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33150) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e3zHn-0002vt-Us for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:04 -0400 From: Peter Xu Date: Mon, 16 Oct 2017 14:52:09 +0800 Message-Id: <20171016065216.18162-26-peterx@redhat.com> In-Reply-To: <20171016065216.18162-1-peterx@redhat.com> References: <20171016065216.18162-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v3 25/32] migration: return incoming task tag for exec List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andrea Arcangeli , "Daniel P . Berrange" , Juan Quintela , Alexey Perevalov , "Dr . David Alan Gilbert" , peterx@redhat.com Return the async task tag for exec typed incoming migration in exec_start_incoming_migration(). Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu --- migration/exec.c | 18 +++++++++++------- migration/exec.h | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/migration/exec.c b/migration/exec.c index f3be1baf2e..a0796c2c70 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -52,7 +52,11 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, return G_SOURCE_REMOVE; } -void exec_start_incoming_migration(const char *command, Error **errp) +/* + * Returns the tag ID of the watch that is attached to global main + * loop (>0), or zero if failure detected. + */ +guint exec_start_incoming_migration(const char *command, Error **errp) { QIOChannel *ioc; const char *argv[] = { "/bin/sh", "-c", command, NULL }; @@ -62,13 +66,13 @@ void exec_start_incoming_migration(const char *command, Error **errp) O_RDWR, errp)); if (!ioc) { - return; + return 0; } qio_channel_set_name(ioc, "migration-exec-incoming"); - qio_channel_add_watch(ioc, - G_IO_IN, - exec_accept_incoming_migration, - NULL, - NULL); + return qio_channel_add_watch(ioc, + G_IO_IN, + exec_accept_incoming_migration, + NULL, + NULL); } diff --git a/migration/exec.h b/migration/exec.h index b210ffde7a..0a7aadacd3 100644 --- a/migration/exec.h +++ b/migration/exec.h @@ -19,7 +19,7 @@ #ifndef QEMU_MIGRATION_EXEC_H #define QEMU_MIGRATION_EXEC_H -void exec_start_incoming_migration(const char *host_port, Error **errp); +guint exec_start_incoming_migration(const char *host_port, Error **errp); void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); -- 2.13.5