[{"id":3629455,"web_url":"http://patchwork.ozlabs.org/comment/3629455/","msgid":"","list_archive_url":null,"date":"2025-12-29T17:12:10","subject":"Re: [RFC PATCH 10/25] migration: Expand\n migration_connect_error_propagate to cover cancelling","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/","name":"Peter Xu","email":"peterx@redhat.com"},"content":"On Fri, Dec 26, 2025 at 06:19:12PM -0300, Fabiano Rosas wrote:\n> Cover the CANCELLING state in migration_connect_error_propagate() and\n> use it to funnel errors from migrate_prepare() until the end of\n> migration_connect().\n> \n> (add some line breaks for legibility)\n> \n> Signed-off-by: Fabiano Rosas \n> ---\n> migration/migration.c | 24 +++++++++++++++---------\n> 1 file changed, 15 insertions(+), 9 deletions(-)\n> \n> diff --git a/migration/migration.c b/migration/migration.c\n> index 83854d084a..e1c00867ab 100644\n> --- a/migration/migration.c\n> +++ b/migration/migration.c\n> @@ -1575,18 +1575,25 @@ static void migrate_error_free(MigrationState *s)\n> static void migration_connect_error_propagate(MigrationState *s, Error *error)\n> {\n> MigrationStatus current = s->state;\n> - MigrationStatus next;\n> -\n> - assert(s->to_dst_file == NULL);\n> + MigrationStatus next = MIGRATION_STATUS_NONE;\n> \n> switch (current) {\n> case MIGRATION_STATUS_SETUP:\n> next = MIGRATION_STATUS_FAILED;\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> break;\n> +\n> + case MIGRATION_STATUS_CANCELLING:\n> + /*\n> + * Don't move out of CANCELLING, the only valid transition is to\n> + * CANCELLED, at migration_cleanup().\n> + */\n> + break;\n> +\n> default:\n> /*\n> * This really shouldn't happen. Just be careful to not crash a VM\n> @@ -1597,7 +1604,10 @@ static void migration_connect_error_propagate(MigrationState *s, Error *error)\n> return;\n> }\n> \n> - migrate_set_state(&s->state, current, next);\n> + if (next) {\n> + migrate_set_state(&s->state, current, next);\n> + }\n> +\n> migrate_error_propagate(s, error);\n> }\n> \n> @@ -4107,11 +4117,7 @@ void migration_connect(MigrationState *s, Error *error_in)\n> return;\n> \n> fail:\n> - migrate_error_propagate(s, error_copy(local_err));\n> - if (s->state != MIGRATION_STATUS_CANCELLING) {\n> - migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);\n> - }\n> - error_report_err(local_err);\n\nOK you removed this line here.. maybe it should belong to the previous\npatch?\n\nIf you agree, feel free to take:\n\nReviewed-by: Peter Xu \n\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> 2.51.0\n>","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=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=hhJ/3O7d;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=kmPodPRn;\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)"],"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 4dg2q54wsqz1xpZ\n\tfor ; Tue, 30 Dec 2025 04:13:03 +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 1vaGn7-0002GY-JO; Mon, 29 Dec 2025 12:12:21 -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 1vaGn6-0002GC-Bx\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 12:12:20 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1vaGn3-00067M-0r\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 12:12:20 -0500","from mail-qk1-f199.google.com (mail-qk1-f199.google.com\n [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-325-24n8Q904O9aH0dYwAbRtfw-1; Mon, 29 Dec 2025 12:12:12 -0500","by mail-qk1-f199.google.com with SMTP id\n af79cd13be357-8b9ff555d2dso2255996685a.0\n for ; Mon, 29 Dec 2025 09:12:12 -0800 (PST)","from x1.local ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8c096781f33sm2442829485a.11.2025.12.29.09.12.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 29 Dec 2025 09:12:11 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1767028334;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n in-reply-to:in-reply-to:references:references;\n bh=p+N6d6FZ0owyY5D77OCXrnv55/f5iSaSLYIoviXPgjk=;\n b=hhJ/3O7dZsvMGjJYAPJs4YtayfG6nLjqepOLozoIa17P/T5QnB+zwpgRmOAIqmI0jWKMYm\n 6uo26y6nP5W6sWzltlYyqyBa6NtVhwCwGO2o3n7XNazKw+9BZVpr3aUKvOZucYOyvJLXNe\n s14Q4CRMefnUDXNiRzzq95ZgER1wk/s=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1767028332; x=1767633132; darn=nongnu.org;\n h=in-reply-to:content-disposition:mime-version:references:message-id\n :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to;\n bh=p+N6d6FZ0owyY5D77OCXrnv55/f5iSaSLYIoviXPgjk=;\n b=kmPodPRn3NuS60MTsj59eBnjThFc47C1z6I6P2ZruDpMBYUcpJAUlbleAUP0KSQkRb\n q+RuZ7p1t3FC6zdr2wb7oD1Ual1Q6Ax6MkbYPt2JGjSfiWcYSUIaRSc+hFhaBJbklfDQ\n DasqIHBgiQlW6EsLwIqu/ke2HZKs+G7xbQtyXoI9/6seDDMpsZMNrCgjyeVYNPTudqsB\n E7TxJPU3h7vYwF1jDul2OS53woSrQzaQDkQVZbZHtYvC47D81EBRFAt1MAbeU/j9oiUd\n oaO9z+iAv+b1lp9AXDa2U9DB6Z1sHOAeQ88FNPMCDMuZfx/Idogvr/JaehuwJaAMPGBz\n Ap7w=="],"X-MC-Unique":"24n8Q904O9aH0dYwAbRtfw-1","X-Mimecast-MFC-AGG-ID":"24n8Q904O9aH0dYwAbRtfw_1767028332","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1767028332; x=1767633132;\n h=in-reply-to:content-disposition:mime-version:references:message-id\n :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=p+N6d6FZ0owyY5D77OCXrnv55/f5iSaSLYIoviXPgjk=;\n b=qT03K3o6qgpoyK75t5NDhcLw4lPb3uvp3SFrhf5+RgRtc09su8lHPkkATiWxK084So\n ICl/PsYcGoVXVnTt+iZEbLL1WlY577ijURCVy1jZMmNPieHQnXG0snljuaR0c1u4mogP\n JQ+guS1tdSvNEdsAILtprn/bUyYBWip8av2NJnGRhrJMN08eu3rTd8T2Wn4xcmBxS+NJ\n hYLZvrI/kfZenshrNX436o8ZFhB6k6IQNd1H/9xby115nEiQhFHYgjLFB6zCQYEpKSW8\n LHqpo5pUimy1yi4y933127OJnZtzSLoXRMx5gRBY23/GaguAtjh6+L8Z98oij4zWwvpm\n W1cA==","X-Gm-Message-State":"AOJu0YxECDbNq6gAaDZi6JyF6fZ71hss304bAL8cev5bfqSSU3J27m+N\n BhDTc8d/EjNoNjuTjCdKf//0H15Voy5myqhZzZyGW1IagIpkHoE7tXQKuTH737Hm9IuOTZwaaM0\n 0MtUGZjWsletVwbbn7x0Ef6lzDtU7ggUqqQ6EUxK6Q82h6MGlMH1Ng+aI","X-Gm-Gg":"AY/fxX4SbH2+LE7VmCHUhT1FTXH7GdcTSY5XS8eQpc1MgX23zcok+igk8EZw01S7bTJ\n s/nf7K31PVE4o/FGPMXekpludEvmJ9uEyzonA//31m7Q60wfeqqb4hQ63aVWFblJ2WrXvpxbWYW\n NATBQVa7cRGUCwv+17YZvvq/4p79jZO+OD09F3HqTo+hIPKHAqIJbf2uiCtwtHr/XhtWhjrbSMg\n qLnFnjkN8GzxenqhPRo6w4NBIErxbc4uPrRnKno5fOjDDit6QXXDXRdzOaOSA2kYgDggCI1nm2d\n 8VKj5o1F1cfvnsaqB5UkJNMpx3tHoyp+rhg1T8RZfGOoPbMcWogBA1VWyZ5WMgBx9V0wUK/DDBN\n rDF4=","X-Received":["by 2002:a05:620a:1901:b0:8b2:1f04:f83 with SMTP id\n af79cd13be357-8c08fab3fa0mr4419491085a.70.1767028332347;\n Mon, 29 Dec 2025 09:12:12 -0800 (PST)","by 2002:a05:620a:1901:b0:8b2:1f04:f83 with SMTP id\n af79cd13be357-8c08fab3fa0mr4419486985a.70.1767028331890;\n Mon, 29 Dec 2025 09:12:11 -0800 (PST)"],"X-Google-Smtp-Source":"\n AGHT+IH42y7d5tXyANQ3iNdqLtkWY8b2LA9Gfjf2qA/hcZepOvAyWL7dnLl2W8rnICpoK5STEbNb3g==","Date":"Mon, 29 Dec 2025 12:12:10 -0500","From":"Peter Xu ","To":"Fabiano Rosas ","Cc":"qemu-devel@nongnu.org","Subject":"Re: [RFC PATCH 10/25] migration: Expand\n migration_connect_error_propagate to cover cancelling","Message-ID":"","References":"<20251226211930.27565-1-farosas@suse.de>\n <20251226211930.27565-11-farosas@suse.de>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251226211930.27565-11-farosas@suse.de>","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, 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"}}]