{"id":810539,"url":"http://patchwork.ozlabs.org/api/patches/810539/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-8-quintela@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906115143.27451-8-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:28","name":"[v7,07/22] migration: Make migrate_fd_error() the owner of the Error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ff5211aec54eb0af2c2b5f3ba94f9a0fa2983219","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-8-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810539/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810539/checks/","tags":{},"related":[],"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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@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 3xnMXW3tCLz9s8J\n\tfor ;\n\tWed, 6 Sep 2017 21:57:47 +1000 (AEST)","from localhost ([::1]:35595 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpYxl-0003N5-IM\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 07:57:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60200)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsM-0007Og-Bz\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:13 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsL-0007zh-9W\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:10 -0400","from mx1.redhat.com ([209.132.183.28]:53766)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsL-0007zR-0l\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:09 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 051427E421\n\tfor ; Wed, 6 Sep 2017 11:52:08 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id F282618ABA;\n\tWed, 6 Sep 2017 11:52:02 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 051427E421","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:28 +0200","Message-Id":"<20170906115143.27451-8-quintela@redhat.com>","In-Reply-To":"<20170906115143.27451-1-quintela@redhat.com>","References":"<20170906115143.27451-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 06 Sep 2017 11:52:08 +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] [PATCH v7 07/22] migration: Make migrate_fd_error()\n\tthe owner of the Error","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":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"So far, we had to free the error after each caller, so just do it\nhere. Once there, tls.c was leaking the error.\n\nSigned-off-by: Juan Quintela \n---\n migration/channel.c | 1 -\n migration/migration.c | 10 ++++------\n migration/migration.h | 4 ++--\n migration/socket.c | 1 -\n 4 files changed, 6 insertions(+), 10 deletions(-)","diff":"diff --git a/migration/channel.c b/migration/channel.c\nindex 70ec7ea3b7..1dd2ae1530 100644\n--- a/migration/channel.c\n+++ b/migration/channel.c\n@@ -71,7 +71,6 @@ void migration_channel_connect(MigrationState *s,\n migration_tls_channel_connect(s, ioc, hostname, &local_err);\n if (local_err) {\n migrate_fd_error(s, local_err);\n- error_free(local_err);\n }\n } else {\n QEMUFile *f = qemu_fopen_channel_output(ioc);\ndiff --git a/migration/migration.c b/migration/migration.c\nindex 5e17168c1c..6191551e5a 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1021,16 +1021,14 @@ static void migrate_fd_cleanup(void *opaque)\n block_cleanup_parameters(s);\n }\n \n-void migrate_set_error(MigrationState *s, const Error *error)\n+void migrate_set_error(MigrationState *s, Error *error)\n {\n qemu_mutex_lock(&s->error_mutex);\n- if (!s->error) {\n- s->error = error_copy(error);\n- }\n+ error_propagate(&s->error, error);\n qemu_mutex_unlock(&s->error_mutex);\n }\n \n-void migrate_fd_error(MigrationState *s, const Error *error)\n+void migrate_fd_error(MigrationState *s, Error *error)\n {\n trace_migrate_fd_error(error_get_pretty(error));\n assert(s->to_dst_file == NULL);\n@@ -1304,7 +1302,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,\n }\n \n if (local_err) {\n- migrate_fd_error(s, local_err);\n+ migrate_fd_error(s, error_copy(local_err));\n error_propagate(errp, local_err);\n return;\n }\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 9a81b8a70a..7ddb0cdc1a 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -163,8 +163,8 @@ bool migration_has_all_channels(void);\n \n uint64_t migrate_max_downtime(void);\n \n-void migrate_set_error(MigrationState *s, const Error *error);\n-void migrate_fd_error(MigrationState *s, const Error *error);\n+void migrate_set_error(MigrationState *s, Error *error);\n+void migrate_fd_error(MigrationState *s, Error *error);\n \n void migrate_fd_connect(MigrationState *s);\n \ndiff --git a/migration/socket.c b/migration/socket.c\nindex dee869044a..2d70747a1a 100644\n--- a/migration/socket.c\n+++ b/migration/socket.c\n@@ -80,7 +80,6 @@ static void socket_outgoing_migration(QIOTask *task,\n if (qio_task_propagate_error(task, &err)) {\n trace_migration_socket_outgoing_error(error_get_pretty(err));\n migrate_fd_error(data->s, err);\n- error_free(err);\n } else {\n trace_migration_socket_outgoing_connected(data->hostname);\n migration_channel_connect(data->s, sioc, data->hostname);\n","prefixes":["v7","07/22"]}