[{"id":3629445,"web_url":"http://patchwork.ozlabs.org/comment/3629445/","msgid":"","list_archive_url":null,"date":"2025-12-29T16:45:02","subject":"Re: [RFC PATCH 09/25] migration: Move error reporting out of\n migration_cleanup","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:11PM -0300, Fabiano Rosas wrote:\n> In the next patches migration_cleanup() will be used in qmp_migrate(),\n> which currently does not show an error message. Move the error\n> reporting out of migration_cleanup() to avoid duplicated messages.\n> \n> Signed-off-by: Fabiano Rosas \n\nReviewed-by: Peter Xu \n\nWith one comment on top below:\n\n> ---\n> migration/migration.c | 28 +++++++++++++---------------\n> 1 file changed, 13 insertions(+), 15 deletions(-)\n> \n> diff --git a/migration/migration.c b/migration/migration.c\n> index a56f8fb05e..83854d084a 100644\n> --- a/migration/migration.c\n> +++ b/migration/migration.c\n> @@ -1528,10 +1528,6 @@ static void migration_cleanup(MigrationState *s)\n> MIGRATION_STATUS_CANCELLED);\n> }\n> \n> - if (s->error) {\n> - /* It is used on info migrate. We can't free it */\n> - error_report_err(error_copy(s->error));\n> - }\n> type = migration_has_failed(s) ? MIG_EVENT_PRECOPY_FAILED :\n> MIG_EVENT_PRECOPY_DONE;\n> migration_call_notifiers(s, type, NULL);\n> @@ -1540,7 +1536,12 @@ static void migration_cleanup(MigrationState *s)\n> \n> static void migration_cleanup_bh(void *opaque)\n> {\n> - migration_cleanup(opaque);\n> + MigrationState *s = opaque;\n> +\n> + migration_cleanup(s);\n> + if (s->error) {\n> + error_report_err(error_copy(s->error));\n> + }\n> }\n> \n> /*\n> @@ -4026,18 +4027,12 @@ 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> - /*\n> - * Don't do cleanup for resume if channel is invalid, but only dump\n> - * the error. We wait for another channel connect from the user.\n> - * The error_report still gives HMP user a hint on what failed.\n> - * It's normally done in migration_cleanup(), but call it here\n> - * explicitly.\n> - */\n> - error_report_err(error_copy(s->error));\n> - } else {\n> + if (!resume) {\n> migration_cleanup(s);\n> }\n> + if (s->error) {\n> + error_report_err(error_copy(s->error));\n> + }\n> return;\n> }\n> \n> @@ -4118,6 +4113,9 @@ fail:\n> }\n> error_report_err(local_err);\n\n[1]\n\n> migration_cleanup(s);\n> + if (s->error) {\n> + error_report_err(error_copy(s->error));\n> + }\n\nThis should keep no functional difference, which looks correct from that\nregard.\n\nSaid that, I wonder if we can drop [1] above, because when reaching here\nerror_in must not be set, so I don't yet see how s->error can be different\nfrom local_err.\n\n> }\n> \n> static void migration_class_init(ObjectClass *klass, const void *data)\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=VmGLEO+c;\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=cLE5fePz;\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 4dg2CX3hHgz1xpS\n\tfor ; Tue, 30 Dec 2025 03:45:44 +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 1vaGMo-0001r7-Rm; Mon, 29 Dec 2025 11:45:10 -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 1vaGMn-0001qv-GR\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 11:45:09 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.133.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 1vaGMl-0000t8-Ea\n for qemu-devel@nongnu.org; Mon, 29 Dec 2025 11:45:09 -0500","from mail-qt1-f198.google.com (mail-qt1-f198.google.com\n [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-244-xOAy-ZX1NqGjA8L6TI7RVQ-1; Mon, 29 Dec 2025 11:45:04 -0500","by mail-qt1-f198.google.com with SMTP id\n d75a77b69052e-4f1d2aa793fso251578511cf.3\n for ; Mon, 29 Dec 2025 08:45:04 -0800 (PST)","from x1.local ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id\n d75a77b69052e-4f4ad519939sm226260081cf.2.2025.12.29.08.45.02\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 29 Dec 2025 08:45:03 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1767026706;\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=bl7UafSFz8NAw+s63DbEEtHNSwrPFrQtS6OUwiDmhIQ=;\n b=VmGLEO+cJxkR6i+59HYDuRfGaLSejVkpKPy5ny+7VtKL1502aAEoxxhe0jEkbjkA+aObNt\n BQ/0ik7TDe2vw4ab71ZPuNB03aXeTsSGODYjuPSMMhoMHWo6SD5LzcmTZKHXawMJO8tIjL\n 8G2Nm6uX8OokO5kI9HU9Zn/oSZDZoyM=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1767026704; x=1767631504; 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=bl7UafSFz8NAw+s63DbEEtHNSwrPFrQtS6OUwiDmhIQ=;\n b=cLE5fePzl7qa9bLMRWddGXvyoKAmxI2QNdmg689ms6tv4yqimjeBD6xMq+slcoWqD8\n yzjBFTvFs0kZXIQDVrFHi6lYG7JJWHIx1SMVFCamezzrek3HjiEMtgZMoV+8z+03MYFk\n LP0gBHkjcxQblrs6w3ghRL66WTP262WbOIs0jmhk3Ah0Z8ZBeTXIB+c2RWUkgfBzKwOS\n ztsCCsfiNk3FItd9ne9W2vHsftnxtQRdzqCmVdlKdXndfkliDi+TIFnNyNGnx4/547eO\n uySV/rmr14njOw9uhl2VZrAzYjr8l1KjNfUIrysRVl5QU9T+xNxRVg8yi8Uup7YdlNwE\n c0hA=="],"X-MC-Unique":"xOAy-ZX1NqGjA8L6TI7RVQ-1","X-Mimecast-MFC-AGG-ID":"xOAy-ZX1NqGjA8L6TI7RVQ_1767026704","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1767026704; x=1767631504;\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=bl7UafSFz8NAw+s63DbEEtHNSwrPFrQtS6OUwiDmhIQ=;\n b=mfiJ6eelSuqjlQ/d9mCsEscAENeLpwGjrs39MkzGW/0335vQp0Fq7IlPv85lHtcpCl\n wCcr55uPeVCnJzcbGtL4xdp1WKD11F61ujGbCFHmn3XXymHupxRv9OWTxwAg8KI8iGJD\n ssolmclv4RIhuwtbs+L66JrUK98b+zds8gsw8sbcI+qe/5Fh0K2Ntvl9U5lqyqOLFtSX\n ev85pwuOsbB06HTf1wjgPWQv/xe08nNJhk6G5OOnkbpqsHCkzsyH/oDYD85OoYsbF1Cx\n kKHPbzsEY8Mq21tCZuwPCiYGxuh2nD6nvhHn0VBE+Htq0dnoH5NFyl5vZO37NAUMf/gh\n oqTw==","X-Gm-Message-State":"AOJu0YwzbPgfyJYrDEmQCuRV/MjaYlpqE6XlzXvWM9wkgI1QpWTFUdgj\n T7NEqYjzLWJsJqTj9/7orMMYsopKEF9UZKI7pWIz5thipX9bAlVPNP72mkPLYgfvUTuOhWkh+GT\n pMQbvmt55p3E9XCeppF2Q87ZqjztGuskcushp+eqygj0v4Ir2n4+lEUHQ","X-Gm-Gg":"AY/fxX5+tr0YpXQe1FFrt/6rCvPehobyD4N7YNwwM9+RRfYtHzzhLewn5C/CshyOqvv\n 407PWpHEYdUPwVkDmkzh9A9n9/ypJmIdX8ZVMMLJosxsTjyrAHWUriksi6LEzKXuLSTa1UK5aVI\n atF+B7R0e0+vPNWW0ydM3gkvoSRQBqU7RNayxavOmAqSoiSjGJZcV7xpKOxaDwqy6cN8tmG6Zo4\n Dj526gs8xTYvajH4vUAIIoP25L3QcCyUwMEXFZOIjLyuswlavsRHybxrCk4MWZUwWULW/7oLFek\n Zt0ASJrBX29llefFndl3l9dta2/sBtyvKkZypmF3gz2+L4sE8meHSMaDtagDPCzbh/7VD8yiSLT\n HxG0=","X-Received":["by 2002:a05:622a:480a:b0:4f1:b6bc:5833 with SMTP id\n d75a77b69052e-4f4abd7d3ffmr463177621cf.54.1767026703892;\n Mon, 29 Dec 2025 08:45:03 -0800 (PST)","by 2002:a05:622a:480a:b0:4f1:b6bc:5833 with SMTP id\n d75a77b69052e-4f4abd7d3ffmr463177291cf.54.1767026703431;\n Mon, 29 Dec 2025 08:45:03 -0800 (PST)"],"X-Google-Smtp-Source":"\n AGHT+IFJvgsuSsXrQDnTNFG0RiZ9IABB7D2ypdIjiSyvNYsS1z+Mf/k/Do8e3AfPi1ySpZCRM6sNEw==","Date":"Mon, 29 Dec 2025 11:45:02 -0500","From":"Peter Xu ","To":"Fabiano Rosas ","Cc":"qemu-devel@nongnu.org","Subject":"Re: [RFC PATCH 09/25] migration: Move error reporting out of\n migration_cleanup","Message-ID":"","References":"<20251226211930.27565-1-farosas@suse.de>\n <20251226211930.27565-10-farosas@suse.de>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251226211930.27565-10-farosas@suse.de>","Received-SPF":"pass client-ip=170.10.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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"}}]