Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2177602/?format=api
{ "id": 2177602, "url": "http://patchwork.ozlabs.org/api/patches/2177602/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-14-farosas@suse.de/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<20251226211930.27565-14-farosas@suse.de>", "list_archive_url": null, "date": "2025-12-26T21:19:15", "name": "[RFC,13/25] migration: Handle error in the early async paths", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ff4463a3694b89021b2206f490a4fe4a1bdac422", "submitter": { "id": 85343, "url": "http://patchwork.ozlabs.org/api/people/85343/?format=api", "name": "Fabiano Rosas", "email": "farosas@suse.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-14-farosas@suse.de/mbox/", "series": [ { "id": 486505, "url": "http://patchwork.ozlabs.org/api/series/486505/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=486505", "date": "2025-12-26T21:19:04", "name": "migration: Cleanup early connection code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/486505/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2177602/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2177602/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=LMzODdlN;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=ECkITQoA;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=LMzODdlN;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=ECkITQoA;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)", "smtp-out1.suse.de;\n\tnone" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4ddJRw4RTWz1y3s\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 27 Dec 2025 08:20:27 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vZFEB-0001KU-8n; Fri, 26 Dec 2025 16:20:03 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <farosas@suse.de>) id 1vZFEA-0001Jz-Jw\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:02 -0500", "from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <farosas@suse.de>) id 1vZFE8-0003mV-Fa\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:02 -0500", "from imap1.dmz-prg2.suse.org (unknown [10.150.64.97])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-out1.suse.de (Postfix) with ESMTPS id 3A2D7336AB;\n Fri, 26 Dec 2025 21:19:55 +0000 (UTC)", "from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E71F73EA63;\n Fri, 26 Dec 2025 21:19:53 +0000 (UTC)", "from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n by imap1.dmz-prg2.suse.org with ESMTPSA id WFlNKfn7TmnwJwAAD6G6ig\n (envelope-from <farosas@suse.de>); Fri, 26 Dec 2025 21:19:53 +0000" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766783995;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=4BzbGqFwFOK2ajQx/33sVvImDxmocIbV7q3s/xH1rJI=;\n b=LMzODdlNg0VfOcP2/TRu6FSYIZNSHB6bZlvZ07Kz9CZkjIOZkFGnwtqtI22OzYAGHNJdB2\n U+zBCpSCLtYJ/5hMDuZIbVzm3AQVbC7+QALj4cL5Jb7cK7RxllTBNJ1STgxGpxWEgNa+CA\n XTZvgVe5XLyhR/sdc3PuTCZ98W0qTY0=", "v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766783995;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=4BzbGqFwFOK2ajQx/33sVvImDxmocIbV7q3s/xH1rJI=;\n b=ECkITQoABLbGdPtl93YjSe3s4dg/CYXJzbaul4+VUs+4TsanumN5jD21L/bmUx5Rgj0YSx\n FLLHAa8+PSk/kADg==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766783995;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=4BzbGqFwFOK2ajQx/33sVvImDxmocIbV7q3s/xH1rJI=;\n b=LMzODdlNg0VfOcP2/TRu6FSYIZNSHB6bZlvZ07Kz9CZkjIOZkFGnwtqtI22OzYAGHNJdB2\n U+zBCpSCLtYJ/5hMDuZIbVzm3AQVbC7+QALj4cL5Jb7cK7RxllTBNJ1STgxGpxWEgNa+CA\n XTZvgVe5XLyhR/sdc3PuTCZ98W0qTY0=", "v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766783995;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=4BzbGqFwFOK2ajQx/33sVvImDxmocIbV7q3s/xH1rJI=;\n b=ECkITQoABLbGdPtl93YjSe3s4dg/CYXJzbaul4+VUs+4TsanumN5jD21L/bmUx5Rgj0YSx\n FLLHAa8+PSk/kADg==" ], "From": "Fabiano Rosas <farosas@suse.de>", "To": "qemu-devel@nongnu.org", "Cc": "peterx@redhat.com,\n\tLi Zhijian <lizhijian@fujitsu.com>", "Subject": "[RFC PATCH 13/25] migration: Handle error in the early async paths", "Date": "Fri, 26 Dec 2025 18:19:15 -0300", "Message-ID": "<20251226211930.27565-14-farosas@suse.de>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20251226211930.27565-1-farosas@suse.de>", "References": "<20251226211930.27565-1-farosas@suse.de>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spamd-Result": "default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[];\n R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.987];\n MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+];\n TO_DN_SOME(0.00)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email];\n RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[]", "X-Spam-Score": "-2.80", "Received-SPF": "pass client-ip=2a07:de40:b251:101:10:150:64:1;\n envelope-from=farosas@suse.de; helo=smtp-out1.suse.de", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Simplify migration_channel_connect() and migration_connect() to not\ntake an error as input. Move the error handling into the paths that\ngenerate the error.\n\nTo achive this, call migration_connect_error_propagate() from socket.c\nand tls.c, which are the async paths.\n\nFor the sync paths, the handling is done as normal by returning all\nthe way to qmp_migrate_finish(), except that now the sync paths don't\npass the error forward into migration_connect() anymore.\n\nSigned-off-by: Fabiano Rosas <farosas@suse.de>\n---\n migration/channel.c | 46 +++++++++++++++++-------------------------\n migration/channel.h | 4 +---\n migration/exec.c | 2 +-\n migration/fd.c | 2 +-\n migration/file.c | 2 +-\n migration/migration.c | 11 ++--------\n migration/migration.h | 3 ++-\n migration/rdma.c | 2 +-\n migration/socket.c | 17 ++++++++--------\n migration/tls.c | 19 ++++++++---------\n migration/tls.h | 4 +---\n migration/trace-events | 2 +-\n 12 files changed, 49 insertions(+), 65 deletions(-)", "diff": "diff --git a/migration/channel.c b/migration/channel.c\nindex ba14f66d85..7243b99108 100644\n--- a/migration/channel.c\n+++ b/migration/channel.c\n@@ -60,38 +60,30 @@ void migration_channel_process_incoming(QIOChannel *ioc)\n *\n * @s: Current migration state\n * @ioc: Channel to which we are connecting\n- * @error: Error indicating failure to connect, free'd here\n */\n-void migration_channel_connect(MigrationState *s,\n- QIOChannel *ioc,\n- Error *error)\n+void migration_channel_connect(MigrationState *s, QIOChannel *ioc)\n {\n- trace_migration_set_outgoing_channel(\n- ioc, object_get_typename(OBJECT(ioc)), error);\n+ trace_migration_set_outgoing_channel(ioc, object_get_typename(OBJECT(ioc)));\n \n- if (!error) {\n- if (migrate_channel_requires_tls_upgrade(ioc)) {\n- migration_tls_channel_connect(s, ioc, &error);\n+ if (migrate_channel_requires_tls_upgrade(ioc)) {\n+ migration_tls_channel_connect(s, ioc);\n \n- if (!error) {\n- /* tls_channel_connect will call back to this\n- * function after the TLS handshake,\n- * so we mustn't call migration_connect until then\n- */\n-\n- return;\n- }\n- } else {\n- QEMUFile *f = qemu_file_new_output(ioc);\n-\n- migration_ioc_register_yank(ioc);\n-\n- qemu_mutex_lock(&s->qemu_file_lock);\n- s->to_dst_file = f;\n- qemu_mutex_unlock(&s->qemu_file_lock);\n- }\n+ /*\n+ * async: the above will call back to this function after\n+ * the TLS handshake is successfully completed.\n+ */\n+ return;\n }\n- migration_connect(s, error);\n+\n+ QEMUFile *f = qemu_file_new_output(ioc);\n+\n+ migration_ioc_register_yank(ioc);\n+\n+ qemu_mutex_lock(&s->qemu_file_lock);\n+ s->to_dst_file = f;\n+ qemu_mutex_unlock(&s->qemu_file_lock);\n+\n+ migration_connect(s);\n }\n \n \ndiff --git a/migration/channel.h b/migration/channel.h\nindex 2215091323..ccfeaaef18 100644\n--- a/migration/channel.h\n+++ b/migration/channel.h\n@@ -20,9 +20,7 @@\n \n void migration_channel_process_incoming(QIOChannel *ioc);\n \n-void migration_channel_connect(MigrationState *s,\n- QIOChannel *ioc,\n- Error *error_in);\n+void migration_channel_connect(MigrationState *s, QIOChannel *ioc);\n \n int migration_channel_read_peek(QIOChannel *ioc,\n const char *buf,\ndiff --git a/migration/exec.c b/migration/exec.c\nindex 78fe0fff13..d83a07435a 100644\n--- a/migration/exec.c\n+++ b/migration/exec.c\n@@ -55,7 +55,7 @@ void exec_start_outgoing_migration(MigrationState *s, strList *command,\n }\n \n qio_channel_set_name(ioc, \"migration-exec-outgoing\");\n- migration_channel_connect(s, ioc, NULL);\n+ migration_channel_connect(s, ioc);\n object_unref(OBJECT(ioc));\n }\n \ndiff --git a/migration/fd.c b/migration/fd.c\nindex c956b260a4..0144a70742 100644\n--- a/migration/fd.c\n+++ b/migration/fd.c\n@@ -70,7 +70,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **\n }\n \n qio_channel_set_name(ioc, \"migration-fd-outgoing\");\n- migration_channel_connect(s, ioc, NULL);\n+ migration_channel_connect(s, ioc);\n object_unref(OBJECT(ioc));\n }\n \ndiff --git a/migration/file.c b/migration/file.c\nindex c490f2b219..7bb9c1c79f 100644\n--- a/migration/file.c\n+++ b/migration/file.c\n@@ -122,7 +122,7 @@ void file_start_outgoing_migration(MigrationState *s,\n return;\n }\n qio_channel_set_name(ioc, \"migration-file-outgoing\");\n- migration_channel_connect(s, ioc, NULL);\n+ migration_channel_connect(s, ioc);\n }\n \n static gboolean file_accept_incoming_migration(QIOChannel *ioc,\ndiff --git a/migration/migration.c b/migration/migration.c\nindex a66b2d7aaf..5c6c76f110 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1572,7 +1572,7 @@ static void migrate_error_free(MigrationState *s)\n }\n }\n \n-static void migration_connect_error_propagate(MigrationState *s, Error *error)\n+void migration_connect_error_propagate(MigrationState *s, Error *error)\n {\n MigrationStatus current = s->state;\n MigrationStatus next = MIGRATION_STATUS_NONE;\n@@ -4033,7 +4033,7 @@ fail_setup:\n return NULL;\n }\n \n-void migration_connect(MigrationState *s, Error *error_in)\n+void migration_connect(MigrationState *s)\n {\n Error *local_err = NULL;\n uint64_t rate_limit;\n@@ -4041,13 +4041,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n int ret;\n \n s->expected_downtime = migrate_downtime_limit();\n- if (error_in) {\n- migration_connect_error_propagate(s, error_in);\n- if (s->error) {\n- error_report_err(error_copy(s->error));\n- }\n- return;\n- }\n \n if (resume) {\n /* This is a resumed migration */\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 4d42e8f9a7..f340cd518d 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -532,10 +532,11 @@ void migration_incoming_process(void);\n \n bool migration_has_all_channels(void);\n \n+void migration_connect_error_propagate(MigrationState *s, Error *error);\n void migrate_error_propagate(MigrationState *s, Error *error);\n bool migrate_has_error(MigrationState *s);\n \n-void migration_connect(MigrationState *s, Error *error_in);\n+void migration_connect(MigrationState *s);\n \n int migration_call_notifiers(MigrationState *s, MigrationEventType type,\n Error **errp);\ndiff --git a/migration/rdma.c b/migration/rdma.c\nindex 337b415889..596a1aba0b 100644\n--- a/migration/rdma.c\n+++ b/migration/rdma.c\n@@ -3997,7 +3997,7 @@ void rdma_start_outgoing_migration(void *opaque,\n \n s->to_dst_file = rdma_new_output(rdma);\n s->rdma_migration = true;\n- migration_connect(s, NULL);\n+ migration_connect(s);\n return;\n return_path_err:\n qemu_rdma_cleanup(rdma);\ndiff --git a/migration/socket.c b/migration/socket.c\nindex 426f363b99..298bac30cc 100644\n--- a/migration/socket.c\n+++ b/migration/socket.c\n@@ -59,24 +59,25 @@ static void socket_outgoing_migration(QIOTask *task,\n gpointer opaque)\n {\n struct SocketConnectData *data = opaque;\n- QIOChannel *sioc = QIO_CHANNEL(qio_task_get_source(task));\n+ g_autoptr(QIOChannel) sioc = QIO_CHANNEL(qio_task_get_source(task));\n Error *err = NULL;\n \n if (qio_task_propagate_error(task, &err)) {\n- trace_migration_socket_outgoing_error(error_get_pretty(err));\n- goto out;\n+ goto err;\n }\n \n- trace_migration_socket_outgoing_connected();\n-\n if (migrate_zero_copy_send() &&\n !qio_channel_has_feature(sioc, QIO_CHANNEL_FEATURE_WRITE_ZERO_COPY)) {\n error_setg(&err, \"Zero copy send feature not detected in host kernel\");\n+ goto err;\n }\n \n-out:\n- migration_channel_connect(data->s, sioc, err);\n- object_unref(OBJECT(sioc));\n+ trace_migration_socket_outgoing_connected();\n+ migration_channel_connect(data->s, sioc);\n+ return;\n+err:\n+ trace_migration_socket_outgoing_error(error_get_pretty(err));\n+ migration_connect_error_propagate(data->s, err);\n }\n \n void socket_start_outgoing_migration(MigrationState *s,\ndiff --git a/migration/tls.c b/migration/tls.c\nindex 82f58cbc78..a54e8e6e14 100644\n--- a/migration/tls.c\n+++ b/migration/tls.c\n@@ -104,16 +104,17 @@ static void migration_tls_outgoing_handshake(QIOTask *task,\n gpointer opaque)\n {\n MigrationState *s = opaque;\n- QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task));\n+ g_autoptr(QIOChannel) ioc = QIO_CHANNEL(qio_task_get_source(task));\n Error *err = NULL;\n \n if (qio_task_propagate_error(task, &err)) {\n trace_migration_tls_outgoing_handshake_error(error_get_pretty(err));\n- } else {\n- trace_migration_tls_outgoing_handshake_complete();\n+ migration_connect_error_propagate(s, err);\n+ return;\n }\n- migration_channel_connect(s, ioc, err);\n- object_unref(OBJECT(ioc));\n+\n+ trace_migration_tls_outgoing_handshake_complete();\n+ migration_channel_connect(s, ioc);\n }\n \n QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,\n@@ -129,14 +130,14 @@ QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,\n return qio_channel_tls_new_client(ioc, creds, migrate_tls_hostname(), errp);\n }\n \n-void migration_tls_channel_connect(MigrationState *s,\n- QIOChannel *ioc,\n- Error **errp)\n+void migration_tls_channel_connect(MigrationState *s, QIOChannel *ioc)\n {\n QIOChannelTLS *tioc;\n+ Error *local_err = NULL;\n \n- tioc = migration_tls_client_create(ioc, errp);\n+ tioc = migration_tls_client_create(ioc, &local_err);\n if (!tioc) {\n+ migration_connect_error_propagate(s, local_err);\n return;\n }\n \ndiff --git a/migration/tls.h b/migration/tls.h\nindex 7cd9c76013..7399c42edf 100644\n--- a/migration/tls.h\n+++ b/migration/tls.h\n@@ -29,9 +29,7 @@ void migration_tls_channel_process_incoming(QIOChannel *ioc, Error **errp);\n QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,\n Error **errp);\n \n-void migration_tls_channel_connect(MigrationState *s,\n- QIOChannel *ioc,\n- Error **errp);\n+void migration_tls_channel_connect(MigrationState *s, QIOChannel *ioc);\n void migration_tls_channel_end(QIOChannel *ioc, Error **errp);\n /* Whether the QIO channel requires further TLS handshake? */\n bool migrate_channel_requires_tls_upgrade(QIOChannel *ioc);\ndiff --git a/migration/trace-events b/migration/trace-events\nindex da8f909cac..cbf10d0b63 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -204,7 +204,7 @@ migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma)\n \n # channel.c\n migration_set_incoming_channel(void *ioc, const char *ioctype) \"ioc=%p ioctype=%s\"\n-migration_set_outgoing_channel(void *ioc, const char *ioctype, void *err) \"ioc=%p ioctype=%s err=%p\"\n+migration_set_outgoing_channel(void *ioc, const char *ioctype) \"ioc=%p ioctype=%s\"\n \n # global_state.c\n migrate_state_too_big(void) \"\"\n", "prefixes": [ "RFC", "13/25" ] }