{"id":2177616,"url":"http://patchwork.ozlabs.org/api/patches/2177616/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20251226211930.27565-13-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-13-farosas@suse.de>","list_archive_url":null,"date":"2025-12-26T21:19:14","name":"[RFC,12/25] migration: Fold migration_cleanup() into migration_connect_error_propagate()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"32d83a2699caaef3bd47114def2451b4b5ebeb48","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-13-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/2177616/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2177616/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=MWoKprGX;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=bdLwD60T;\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=MWoKprGX;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=bdLwD60T;\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\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 4ddJTL3l58z1y3s\n\tfor ; Sat, 27 Dec 2025 08:21:42 +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 1vZFEb-0001Zt-Bu; Fri, 26 Dec 2025 16:20:29 -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 1vZFEY-0001Wn-6V\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:26 -0500","from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1vZFEW-00049C-HC\n for qemu-devel@nongnu.org; Fri, 26 Dec 2025 16:20:25 -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-out2.suse.de (Postfix) with ESMTPS id 3CDF55BCE5;\n Fri, 26 Dec 2025 21:19:53 +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 3403E3EA63;\n Fri, 26 Dec 2025 21:19:51 +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 CIIZOff7TmnwJwAAD6G6ig\n (envelope-from ); Fri, 26 Dec 2025 21:19:51 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766783993;\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=CpioNFBDFseAudiqE/+vF5sojicQMZ0mCcG2JfPLxZM=;\n b=MWoKprGX8cqXJ518tBywc/9qIEEWzUcWjvBEuTcKZGIVQXkwJ3oq+0ouw28B1scUK31FTR\n 0YlDVpeGgG8/zfJk51d+ZeZi0RA/A0gxl1peiV+gC7LpOuUZXWzyhpE5tRPIace4qGjfbk\n WF0jhYGRk+cCudO9Ka0lYunbv0HpslM=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766783993;\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=CpioNFBDFseAudiqE/+vF5sojicQMZ0mCcG2JfPLxZM=;\n b=bdLwD60T8DjKTOTRPswePsoQ5Y6u/Cc8uvCApbnLX1b1tXfjEwHC2NX7NfTrxLClm3SICx\n m0I/KPb81lnzw6Bg==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1766783993;\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=CpioNFBDFseAudiqE/+vF5sojicQMZ0mCcG2JfPLxZM=;\n b=MWoKprGX8cqXJ518tBywc/9qIEEWzUcWjvBEuTcKZGIVQXkwJ3oq+0ouw28B1scUK31FTR\n 0YlDVpeGgG8/zfJk51d+ZeZi0RA/A0gxl1peiV+gC7LpOuUZXWzyhpE5tRPIace4qGjfbk\n WF0jhYGRk+cCudO9Ka0lYunbv0HpslM=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1766783993;\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=CpioNFBDFseAudiqE/+vF5sojicQMZ0mCcG2JfPLxZM=;\n b=bdLwD60T8DjKTOTRPswePsoQ5Y6u/Cc8uvCApbnLX1b1tXfjEwHC2NX7NfTrxLClm3SICx\n m0I/KPb81lnzw6Bg=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"peterx@redhat.com","Subject":"[RFC PATCH 12/25] migration: Fold migration_cleanup() into\n migration_connect_error_propagate()","Date":"Fri, 26 Dec 2025 18:19:14 -0300","Message-ID":"<20251226211930.27565-13-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-Spam-Score":"-2.80","X-Spamd-Result":"default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%];\n MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000];\n R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.984];\n MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2];\n FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[];\n RCVD_VIA_SMTP_AUTH(0.00)[];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo];\n URIBL_BLOCKED(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo];\n FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[];\n MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2];\n TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[];\n RCVD_TLS_ALL(0.00)[]","Received-SPF":"pass client-ip=2a07:de40:b251:101:10:150:64:2;\n envelope-from=farosas@suse.de; helo=smtp-out2.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":"","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":"Whenever an error occurs between migrate_init() and the start of\nmigration_thread, do cleanup immediately after.\n\nThis allows the special casing for resume to be removed from\nmigration_connect(), that check is now done at\nmigration_connect_error_propagate() which already had a case for\nresume.\n\nSigned-off-by: Fabiano Rosas \n---\n migration/migration.c | 42 +++++++++++++++++++++++++++---------------\n 1 file changed, 27 insertions(+), 15 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 0f1644b276..a66b2d7aaf 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1576,15 +1576,21 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n {\n MigrationStatus current = s->state;\n MigrationStatus next = MIGRATION_STATUS_NONE;\n+ bool resume = false;\n \n switch (current) {\n case MIGRATION_STATUS_SETUP:\n next = MIGRATION_STATUS_FAILED;\n break;\n \n+ case MIGRATION_STATUS_POSTCOPY_PAUSED:\n+ resume = true;\n+ break;\n+\n case MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP:\n /* Never fail a postcopy migration; switch back to PAUSED instead */\n next = MIGRATION_STATUS_POSTCOPY_PAUSED;\n+ resume = true;\n break;\n \n case MIGRATION_STATUS_CANCELLING:\n@@ -1609,6 +1615,10 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n }\n \n migrate_error_propagate(s, error);\n+\n+ if (!resume) {\n+ migration_cleanup(s);\n+ }\n }\n \n void migration_cancel(void)\n@@ -2209,12 +2219,19 @@ static gboolean qmp_migrate_finish_cb(QIOChannel *channel,\n GIOCondition cond,\n void *opaque)\n {\n+ MigrationState *s = migrate_get_current();\n MigrationAddress *addr = opaque;\n+ Error *local_err = NULL;\n+\n+ qmp_migrate_finish(addr, &local_err);\n+\n+ if (local_err) {\n+ migration_connect_error_propagate(s, local_err);\n+ }\n \n- qmp_migrate_finish(addr, NULL);\n \n cpr_state_close();\n- migrate_hup_delete(migrate_get_current());\n+ migrate_hup_delete(s);\n qapi_free_MigrationAddress(addr);\n return G_SOURCE_REMOVE;\n }\n@@ -2223,7 +2240,6 @@ void qmp_migrate(const char *uri, bool has_channels,\n MigrationChannelList *channels, bool has_detach, bool detach,\n bool has_resume, bool resume, Error **errp)\n {\n- Error *local_err = NULL;\n MigrationState *s = migrate_get_current();\n g_autoptr(MigrationChannel) channel = NULL;\n MigrationAddress *addr = NULL;\n@@ -2280,6 +2296,13 @@ void qmp_migrate(const char *uri, bool has_channels,\n return;\n }\n \n+ /*\n+ * The migrate_prepare() above calls migrate_init(). From this\n+ * point on, until the end of migration, make sure any failures\n+ * eventually result in a call to migration_cleanup().\n+ */\n+ Error *local_err = NULL;\n+\n if (!cpr_state_save(cpr_channel, &local_err)) {\n goto out;\n }\n@@ -2299,12 +2322,11 @@ void qmp_migrate(const char *uri, bool has_channels,\n QAPI_CLONE(MigrationAddress, addr));\n \n } else {\n- qmp_migrate_finish(addr, errp);\n+ qmp_migrate_finish(addr, &local_err);\n }\n \n out:\n if (local_err) {\n- yank_unregister_instance(MIGRATION_YANK_INSTANCE);\n migration_connect_error_propagate(s, error_copy(local_err));\n error_propagate(errp, local_err);\n }\n@@ -2335,12 +2357,6 @@ static void qmp_migrate_finish(MigrationAddress *addr, Error **errp)\n } else {\n error_setg(&local_err, \"uri is not a valid migration protocol\");\n }\n-\n- if (local_err) {\n- migration_connect_error_propagate(s, error_copy(local_err));\n- error_propagate(errp, local_err);\n- return;\n- }\n }\n \n void qmp_migrate_cancel(Error **errp)\n@@ -4027,9 +4043,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n s->expected_downtime = migrate_downtime_limit();\n if (error_in) {\n migration_connect_error_propagate(s, error_in);\n- if (!resume) {\n- migration_cleanup(s);\n- }\n if (s->error) {\n error_report_err(error_copy(s->error));\n }\n@@ -4108,7 +4121,6 @@ void migration_connect(MigrationState *s, Error *error_in)\n \n fail:\n migration_connect_error_propagate(s, local_err);\n- migration_cleanup(s);\n if (s->error) {\n error_report_err(error_copy(s->error));\n }\n","prefixes":["RFC","12/25"]}