{"id":807526,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807526/?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-29-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:25","name":"[RFC,v2,28/33] migration: return incoming task tag for sockets","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3a1f561f76192369db2d63084610a74b4f8e113e","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-29-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/807526/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xj01C4nFCz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 19:03:59 +1000 (AEST)","from localhost ([::1]:49194 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyuj-0000mo-I2\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 05:03:57 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35349)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyTB-0000ow-R3\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyT7-0004Kv-4m\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:29 -0400","from mx1.redhat.com ([209.132.183.28]:52862)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyT6-0004Kj-S3\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:25 -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 D37F413AB0;\n\tWed, 30 Aug 2017 08:35:23 +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 77B2C871E6;\n\tWed, 30 Aug 2017 08:35:19 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D37F413AB0","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:25 +0800","Message-Id":"<1504081950-2528-29-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.29]);\n\tWed, 30 Aug 2017 08:35:23 +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 28/33] migration: return incoming task tag for\n\tsockets","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":"For socket based incoming migration, we attached a background task onto\nmain loop to handle the acception of connections. We never had a way to\ndestroy it before, only if we finished the migration.\n\nLet's allow socket_start_incoming_migration() to return the source tag\nof the listening async work, so that we may be able to clean it up in\nthe future.\n\nSigned-off-by: Peter Xu \n---\n migration/socket.c | 36 ++++++++++++++++++++++++------------\n migration/socket.h | 4 ++--\n 2 files changed, 26 insertions(+), 14 deletions(-)","diff":"diff --git a/migration/socket.c b/migration/socket.c\nindex 9fc6cb3..6ee51ef 100644\n--- a/migration/socket.c\n+++ b/migration/socket.c\n@@ -158,8 +158,12 @@ out:\n }\n \n \n-static void socket_start_incoming_migration(SocketAddress *saddr,\n- 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+static guint socket_start_incoming_migration(SocketAddress *saddr,\n+ Error **errp)\n {\n QIOChannelSocket *listen_ioc = qio_channel_socket_new();\n \n@@ -168,30 +172,38 @@ static void socket_start_incoming_migration(SocketAddress *saddr,\n \n if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {\n object_unref(OBJECT(listen_ioc));\n- return;\n+ return 0;\n }\n \n- qio_channel_add_watch(QIO_CHANNEL(listen_ioc),\n- G_IO_IN,\n- socket_accept_incoming_migration,\n- listen_ioc,\n- (GDestroyNotify)object_unref);\n+ return qio_channel_add_watch(QIO_CHANNEL(listen_ioc),\n+ G_IO_IN,\n+ socket_accept_incoming_migration,\n+ listen_ioc,\n+ (GDestroyNotify)object_unref);\n }\n \n-void tcp_start_incoming_migration(const char *host_port, Error **errp)\n+guint tcp_start_incoming_migration(const char *host_port, Error **errp)\n {\n Error *err = NULL;\n SocketAddress *saddr = tcp_build_address(host_port, &err);\n+ guint tag;\n+\n if (!err) {\n- socket_start_incoming_migration(saddr, &err);\n+ tag = socket_start_incoming_migration(saddr, &err);\n }\n error_propagate(errp, err);\n qapi_free_SocketAddress(saddr);\n+\n+ return tag;\n }\n \n-void unix_start_incoming_migration(const char *path, Error **errp)\n+guint unix_start_incoming_migration(const char *path, Error **errp)\n {\n SocketAddress *saddr = unix_build_address(path);\n- socket_start_incoming_migration(saddr, errp);\n+ guint tag;\n+\n+ tag = socket_start_incoming_migration(saddr, errp);\n qapi_free_SocketAddress(saddr);\n+\n+ return tag;\n }\ndiff --git a/migration/socket.h b/migration/socket.h\nindex 6b91e9d..bc8a59a 100644\n--- a/migration/socket.h\n+++ b/migration/socket.h\n@@ -16,12 +16,12 @@\n \n #ifndef QEMU_MIGRATION_SOCKET_H\n #define QEMU_MIGRATION_SOCKET_H\n-void tcp_start_incoming_migration(const char *host_port, Error **errp);\n+guint tcp_start_incoming_migration(const char *host_port, Error **errp);\n \n void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,\n Error **errp);\n \n-void unix_start_incoming_migration(const char *path, Error **errp);\n+guint unix_start_incoming_migration(const char *path, Error **errp);\n \n void unix_start_outgoing_migration(MigrationState *s, const char *path,\n Error **errp);\n","prefixes":["RFC","v2","28/33"]}