{"id":807518,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807518/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504081950-2528-31-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:27","name":"[RFC,v2,30/33] migration: return incoming task tag for fd","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"51d3d25c3e5d10ddedddd7f94b1b155a148ca66a","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-31-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807518/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhzqX5NwNz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 18:55:36 +1000 (AEST)","from localhost ([::1]:49113 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmymc-0001YW-A5\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:55:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35459)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyTS-00019l-AW\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyTN-0004YK-BV\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:46 -0400","from mx1.redhat.com ([209.132.183.28]:47968)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyTN-0004Xp-5F\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:41 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2A56681DEF;\n\tWed, 30 Aug 2017 08:35:40 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 33D2787C86;\n\tWed, 30 Aug 2017 08:35:33 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2A56681DEF","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:27 +0800","Message-Id":"<1504081950-2528-31-git-send-email-peterx@redhat.com>","In-Reply-To":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","References":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 30 Aug 2017 08:35:40 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC v2 30/33] migration: return incoming task tag for\n\tfd","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Allow to return the task tag in fd_start_incoming_migration().\n\nSigned-off-by: Peter Xu \n---\n migration/fd.c | 18 +++++++++++-------\n migration/fd.h | 2 +-\n 2 files changed, 12 insertions(+), 8 deletions(-)","diff":"diff --git a/migration/fd.c b/migration/fd.c\nindex 30f5258..e9a548c 100644\n--- a/migration/fd.c\n+++ b/migration/fd.c\n@@ -52,7 +52,11 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,\n return FALSE; /* unregister */\n }\n \n-void fd_start_incoming_migration(const char *infd, Error **errp)\n+/*\n+ * Returns the tag ID of the watch that is attached to global main\n+ * loop (>0), or zero if failure detected.\n+ */\n+guint fd_start_incoming_migration(const char *infd, Error **errp)\n {\n QIOChannel *ioc;\n int fd;\n@@ -63,13 +67,13 @@ void fd_start_incoming_migration(const char *infd, Error **errp)\n ioc = qio_channel_new_fd(fd, errp);\n if (!ioc) {\n close(fd);\n- return;\n+ return 0;\n }\n \n qio_channel_set_name(QIO_CHANNEL(ioc), \"migration-fd-incoming\");\n- qio_channel_add_watch(ioc,\n- G_IO_IN,\n- fd_accept_incoming_migration,\n- NULL,\n- NULL);\n+ return qio_channel_add_watch(ioc,\n+ G_IO_IN,\n+ fd_accept_incoming_migration,\n+ NULL,\n+ NULL);\n }\ndiff --git a/migration/fd.h b/migration/fd.h\nindex a14a63c..94cdea8 100644\n--- a/migration/fd.h\n+++ b/migration/fd.h\n@@ -16,7 +16,7 @@\n \n #ifndef QEMU_MIGRATION_FD_H\n #define QEMU_MIGRATION_FD_H\n-void fd_start_incoming_migration(const char *path, Error **errp);\n+guint fd_start_incoming_migration(const char *path, Error **errp);\n \n void fd_start_outgoing_migration(MigrationState *s, const char *fdname,\n Error **errp);\n","prefixes":["RFC","v2","30/33"]}