{"id":2177622,"url":"http://patchwork.ozlabs.org/api/patches/2177622/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-19-farosas@suse.de/","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":"<20251226211930.27565-19-farosas@suse.de>","list_archive_url":null,"date":"2025-12-26T21:19:20","name":"[RFC,18/25] migration: Move transport connection code into channel.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5f2eec34a07c997960ede8b12f6485e7ccd66ea4","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/people/85343/?format=json","name":"Fabiano Rosas","email":"farosas@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-19-farosas@suse.de/mbox/","series":[{"id":486505,"url":"http://patchwork.ozlabs.org/api/series/486505/?format=json","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/2177622/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2177622/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=zQzYxS9N;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=26SSICtP;\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=zQzYxS9N;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=26SSICtP;\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-out2.suse.de;\n dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zQzYxS9N;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=26SSICtP"],"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 4ddJVT4VHVz1y3s\n\tfor ; Sat, 27 Dec 2025 08:22:41 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vZFEy-0002MQ-0J; Fri, 26 Dec 2025 16:20:52 -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 ) id 1vZFEw-00026q-8b\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:50 -0500","from smtp-out2.suse.de ([195.135.223.131])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1vZFEu-0004Jb-BG\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:49 -0500","from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org\n [IPv6:2a07:de40:b281:104: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-out2.suse.de (Postfix) with ESMTPS id 5106B5BCED;\n Fri, 26 Dec 2025 21:20:04 +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 487CF3EA65;\n Fri, 26 Dec 2025 21:20:03 +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 QF+QAgP8TmnwJwAAD6G6ig\n (envelope-from ); Fri, 26 Dec 2025 21:20:03 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766784004;\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=NwBWQAOlWWAwfAr8E79zLNObl5hWx2bTa1SjZ/6nAOU=;\n b=zQzYxS9N8RAxDs2g5dCl79q79fJ51Eckd7IL3kowCRjhkOKJnbt1cSKzdtlL5ehEOUmfe1\n v1N/YF/PNgnAgzcdvOxNuz7Lh8XpOsOpcxQl5D5hrdVZ4kkGAyyQpK2r2vEQ0eaH5XPiTY\n oo3SpVK6qLqEYKcPyPuBkre9BhUyzkQ=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766784004;\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=NwBWQAOlWWAwfAr8E79zLNObl5hWx2bTa1SjZ/6nAOU=;\n b=26SSICtPj2mOOHZ37MKuRoCV7O6qhdYMa7f/0VgwcJee/eygdSmo1hoHQv7cDLj5KLoD2N\n t/HRIZ0l+RxnoPDQ==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766784004;\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=NwBWQAOlWWAwfAr8E79zLNObl5hWx2bTa1SjZ/6nAOU=;\n b=zQzYxS9N8RAxDs2g5dCl79q79fJ51Eckd7IL3kowCRjhkOKJnbt1cSKzdtlL5ehEOUmfe1\n v1N/YF/PNgnAgzcdvOxNuz7Lh8XpOsOpcxQl5D5hrdVZ4kkGAyyQpK2r2vEQ0eaH5XPiTY\n oo3SpVK6qLqEYKcPyPuBkre9BhUyzkQ=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766784004;\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=NwBWQAOlWWAwfAr8E79zLNObl5hWx2bTa1SjZ/6nAOU=;\n b=26SSICtPj2mOOHZ37MKuRoCV7O6qhdYMa7f/0VgwcJee/eygdSmo1hoHQv7cDLj5KLoD2N\n t/HRIZ0l+RxnoPDQ=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"peterx@redhat.com","Subject":"[RFC PATCH 18/25] migration: Move transport connection code into\n channel.c","Date":"Fri, 26 Dec 2025 18:19:20 -0300","Message-ID":"<20251226211930.27565-19-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 [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000];\n R_MISSING_CHARSET(0.50)[];\n R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain];\n MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+];\n FUZZY_RATELIMITED(0.00)[rspamd.com];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns];\n RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[];\n RCPT_COUNT_TWO(0.00)[2];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[];\n SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from];\n RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[];\n RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n DKIM_TRACE(0.00)[suse.de:+]","X-Rspamd-Action":"no action","X-Rspamd-Server":"rspamd2.dmz-prg2.suse.org","X-Rspamd-Queue-Id":"5106B5BCED","X-Spam-Score":"-3.01","Received-SPF":"pass client-ip=195.135.223.131; envelope-from=farosas@suse.de;\n helo=smtp-out2.suse.de","X-Spam_score_int":"-43","X-Spam_score":"-4.4","X-Spam_bar":"----","X-Spam_report":"(-4.4 / 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,\n RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Move the _connect_incoming|outgoing functions to channel.c.\nIt leaves migration.c to deal with the established connection only.\n\n(I sorted the includes)\n\nSigned-off-by: Fabiano Rosas \n---\n migration/channel.c | 66 +++++++++++++++++++++++++++++++++++++++----\n migration/channel.h | 4 +++\n migration/migration.c | 45 ++---------------------------\n 3 files changed, 67 insertions(+), 48 deletions(-)","diff":"diff --git a/migration/channel.c b/migration/channel.c\nindex a9ac3711b5..a06aa8189c 100644\n--- a/migration/channel.c\n+++ b/migration/channel.c\n@@ -12,18 +12,74 @@\n \n #include \"qemu/osdep.h\"\n #include \"channel.h\"\n-#include \"tls.h\"\n+#include \"exec.h\"\n+#include \"fd.h\"\n+#include \"file.h\"\n+#include \"io/channel-socket.h\"\n+#include \"io/channel-tls.h\"\n #include \"migration.h\"\n #include \"multifd.h\"\n-#include \"savevm.h\"\n-#include \"trace.h\"\n #include \"options.h\"\n+#include \"qapi/qapi-types-migration.h\"\n #include \"qapi/error.h\"\n-#include \"io/channel-tls.h\"\n-#include \"io/channel-socket.h\"\n+#include \"qemu-file.h\"\n #include \"qemu/yank.h\"\n+#include \"rdma.h\"\n+#include \"savevm.h\"\n+#include \"socket.h\"\n+#include \"tls.h\"\n+#include \"trace.h\"\n #include \"yank_functions.h\"\n \n+void migration_connect_outgoing(MigrationState *s, MigrationAddress *addr,\n+ Error **errp)\n+{\n+ if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {\n+ SocketAddress *saddr = &addr->u.socket;\n+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||\n+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||\n+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {\n+ socket_connect_outgoing(s, saddr, errp);\n+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {\n+ fd_connect_outgoing(s, saddr->u.fd.str, errp);\n+ }\n+#ifdef CONFIG_RDMA\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {\n+ rdma_connect_outgoing(s, &addr->u.rdma, errp);\n+#endif\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {\n+ exec_connect_outgoing(s, addr->u.exec.args, errp);\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {\n+ file_connect_outgoing(s, &addr->u.file, errp);\n+ } else {\n+ error_setg(errp, \"uri is not a valid migration protocol\");\n+ }\n+}\n+\n+void migration_connect_incoming(MigrationAddress *addr, Error **errp)\n+{\n+ if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {\n+ SocketAddress *saddr = &addr->u.socket;\n+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||\n+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||\n+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {\n+ socket_connect_incoming(saddr, errp);\n+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {\n+ fd_connect_incoming(saddr->u.fd.str, errp);\n+ }\n+#ifdef CONFIG_RDMA\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {\n+ rdma_connect_incoming(&addr->u.rdma, errp);\n+#endif\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {\n+ exec_connect_incoming(addr->u.exec.args, errp);\n+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {\n+ file_connect_incoming(&addr->u.file, errp);\n+ } else {\n+ error_setg(errp, \"unknown migration protocol\");\n+ }\n+}\n+\n bool migration_has_main_and_multifd_channels(void)\n {\n MigrationIncomingState *mis = migration_incoming_get_current();\ndiff --git a/migration/channel.h b/migration/channel.h\nindex 59d169e095..727eabf16c 100644\n--- a/migration/channel.h\n+++ b/migration/channel.h\n@@ -17,6 +17,7 @@\n #define QEMU_MIGRATION_CHANNEL_H\n \n #include \"io/channel.h\"\n+#include \"qapi/qapi-types-migration.h\"\n \n /* Migration channel types */\n enum {\n@@ -38,4 +39,7 @@ int migration_channel_read_peek(QIOChannel *ioc,\n bool migration_has_main_and_multifd_channels(void);\n bool migration_has_all_channels(void);\n \n+void migration_connect_outgoing(MigrationState *s, MigrationAddress *addr,\n+ Error **errp);\n+void migration_connect_incoming(MigrationAddress *addr, Error **errp);\n #endif\ndiff --git a/migration/migration.c b/migration/migration.c\nindex e0aee17317..9e69141e86 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -20,13 +20,10 @@\n #include \"qemu/main-loop.h\"\n #include \"migration/blocker.h\"\n #include \"exec.h\"\n-#include \"fd.h\"\n #include \"file.h\"\n-#include \"socket.h\"\n #include \"system/runstate.h\"\n #include \"system/system.h\"\n #include \"system/cpu-throttle.h\"\n-#include \"rdma.h\"\n #include \"ram.h\"\n #include \"migration/cpr.h\"\n #include \"migration/global_state.h\"\n@@ -787,26 +784,7 @@ static void qemu_setup_incoming_migration(const char *uri, bool has_channels,\n return;\n }\n \n- if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {\n- SocketAddress *saddr = &addr->u.socket;\n- if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||\n- saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||\n- saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {\n- socket_connect_incoming(saddr, errp);\n- } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {\n- fd_connect_incoming(saddr->u.fd.str, errp);\n- }\n-#ifdef CONFIG_RDMA\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {\n- rdma_connect_incoming(&addr->u.rdma, errp);\n-#endif\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {\n- exec_connect_incoming(addr->u.exec.args, errp);\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {\n- file_connect_incoming(&addr->u.file, errp);\n- } else {\n- error_setg(errp, \"unknown migration protocol: %s\", uri);\n- }\n+ migration_connect_incoming(addr, errp);\n \n /* Close cpr socket to tell source that we are listening */\n cpr_state_close();\n@@ -2241,26 +2219,7 @@ static void qmp_migrate_finish(MigrationAddress *addr, Error **errp)\n MigrationState *s = migrate_get_current();\n Error *local_err = NULL;\n \n- if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {\n- SocketAddress *saddr = &addr->u.socket;\n- if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||\n- saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||\n- saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {\n- socket_connect_outgoing(s, saddr, &local_err);\n- } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {\n- fd_connect_outgoing(s, saddr->u.fd.str, &local_err);\n- }\n-#ifdef CONFIG_RDMA\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {\n- rdma_connect_outgoing(s, &addr->u.rdma, &local_err);\n-#endif\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {\n- exec_connect_outgoing(s, addr->u.exec.args, &local_err);\n- } else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {\n- file_connect_outgoing(s, &addr->u.file, &local_err);\n- } else {\n- error_setg(&local_err, \"uri is not a valid migration protocol\");\n- }\n+ migration_connect_outgoing(s, addr, &local_err);\n }\n \n void qmp_migrate_cancel(Error **errp)\n","prefixes":["RFC","18/25"]}