From nobody Mon Feb 9 08:51:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763197979; cv=none; d=zohomail.com; s=zohoarc; b=ScVwpUvvXFXZp4vTyA3q+T1jPTs2h45x2T2gLu2MFx7Wg665gReGdO+TJw8MDJn+YckS6CfmgbypGjbLpmL9V7CwGAR4u5y+K2lC5nUdhtXl8Ua4B67gBKnXZ//2JLNfieLD6nTP+Tnhz8DmbJ//MzjI4k6nQ8ciomhSLmQGGHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763197979; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CnTMv2Vgs6wep0eodIuffaCGNgdM5v53WzVNNDdbet0=; b=DVh7NBcie7DkZpQYgjC/0qRXzGEXmK4Q5oyT5Ret9WU1rNSHUOq4WWkPY0Q7hhLRZHc+uV2eLGs6/AoA9qs+T7YmZfZV5ShbwmW3M6E1OQLbX95ohQmhfSdW19lNH/zJN0rUmQU5Zs+DBQyksxwn9FqCrxaLg4HoBwGdNyPN5U4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763197979515760.5045449814129; Sat, 15 Nov 2025 01:12:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vKCKO-0003uE-Ik; Sat, 15 Nov 2025 04:12:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKL-0003nW-LY for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKK-0005Td-3W for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:13 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-2CxIbapAOFSPs97B-7AQUA-1; Sat, 15 Nov 2025 04:12:05 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 62ADC18A1AC4; Sat, 15 Nov 2025 08:35:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0EAFE1956046; Sat, 15 Nov 2025 08:35:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 13C4921E6935; Sat, 15 Nov 2025 09:35:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763197930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CnTMv2Vgs6wep0eodIuffaCGNgdM5v53WzVNNDdbet0=; b=eLd+js5Jdk3wKsQDFxnUmPQW7Zp/izL6WJ3TzwjB7gjQC3N9v67tGUiISPfdPMIeGKqtaU ubhRFluDCR2ywuEgzFMJIeBWh+y95ns9DjU8EkL6eer79dHMdV52zfkYVbnCmJkolc6aZY xPAy1+0LEjnUJMI+vHp+enzI3kekfEc= X-MC-Unique: 2CxIbapAOFSPs97B-7AQUA-1 X-Mimecast-MFC-AGG-ID: 2CxIbapAOFSPs97B-7AQUA_1763197924 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de Subject: [PATCH 1/3] migration: Plug memory leaks after migrate_set_error() Date: Sat, 15 Nov 2025 09:34:58 +0100 Message-ID: <20251115083500.2753895-2-armbru@redhat.com> In-Reply-To: <20251115083500.2753895-1-armbru@redhat.com> References: <20251115083500.2753895-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763197981243158500 Content-Type: text/plain; charset="utf-8" migrate_set_error(s, err) stores a copy of @err in @s. The original @err is not freed. Most callers free it immediately. Some callers free it later, or pass it on. And some leak it. Fix those. Perhaps migrate_set_error(s, err) should take ownership of @err. The callers that free it immediately would become simpler, and avoid a copy and a deallocation. The others would have to pass error_copy(err). Signed-off-by: Markus Armbruster --- migration/cpr-exec.c | 3 ++- migration/multifd.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/cpr-exec.c b/migration/cpr-exec.c index d284f6e734..0b8344a86f 100644 --- a/migration/cpr-exec.c +++ b/migration/cpr-exec.c @@ -159,11 +159,12 @@ static void cpr_exec_cb(void *opaque) error_report_err(error_copy(err)); migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); migrate_set_error(s, err); + error_free(err); + err =3D NULL; =20 /* Note, we can go from state COMPLETED to FAILED */ migration_call_notifiers(s, MIG_EVENT_PRECOPY_FAILED, NULL); =20 - err =3D NULL; if (!migration_block_activate(&err)) { /* error was already reported */ error_free(err); diff --git a/migration/multifd.c b/migration/multifd.c index 98873cee74..a529c399e4 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -964,6 +964,7 @@ bool multifd_send_setup(void) =20 if (!multifd_new_send_channel_create(p, &local_err)) { migrate_set_error(s, local_err); + error_free(local_err); ret =3D -1; } } @@ -988,6 +989,7 @@ bool multifd_send_setup(void) ret =3D multifd_send_state->ops->send_setup(p, &local_err); if (ret) { migrate_set_error(s, local_err); + error_free(local_err); goto err; } assert(p->iov); --=20 2.49.0 From nobody Mon Feb 9 08:51:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763197980; cv=none; d=zohomail.com; s=zohoarc; b=R/2mYhNGA7+FBMYq2InoP91BOTNtvsg3SMAVDem0poIN/PKX8fU2gRiXWJGf0d3Ju5VdxixhYqu6KDLLwNSUDZa8zxCMYUGxxI1DP9P/we/glORBcXRvzVn56CvKuPKDgZ3oE4i91s8+lGIg0BSeSfpDraLsCaMXuSOGFN3JzA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763197980; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oiw/kGPKk50Ls9x/BwiYwhBbooldPae4YAWxQaCWcjw=; b=ClOA+CnKX7zFK5qDMTxxp0TbPYWoMbgPfnaiHqPOT9vX/fIWhyl548hA3L87hy7EpWB/yOUCZ5I1hhfqkPdim1pu/QwsGgTzjVbsGJMuGA1YEIHuNt2Onov4BPDhYnnqvoMVj/upo38IfX4u2UES6sSKtbVqsUsNP5547cwtafw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763197980827572.2470911129134; Sat, 15 Nov 2025 01:13:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vKCKm-0004x2-DY; Sat, 15 Nov 2025 04:12:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKi-0004q2-EU for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKg-0005VG-16 for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:35 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-150-76rEkok2MhG-UqD8p7pvmg-1; Sat, 15 Nov 2025 04:12:30 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C1A891800652; Sat, 15 Nov 2025 08:35:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F2491956048; Sat, 15 Nov 2025 08:35:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1800D21E676A; Sat, 15 Nov 2025 09:35:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763197952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oiw/kGPKk50Ls9x/BwiYwhBbooldPae4YAWxQaCWcjw=; b=RDzxD2iIDGXREYwjG9bKqC910xhogep1yT1wpBoYfUg0ZSA1PHhFg91QfaPYn7R5IMc7FI 6LL0oVsZJ/K+JpWjGpuIUlyXNCAkolTxWkfdUH3aBMRNQcrAQ2se9vtalDP6MkgoAxidI8 ICtPCPqXfRnbJjcvSJxp4mnTGHKiWZ0= X-MC-Unique: 76rEkok2MhG-UqD8p7pvmg-1 X-Mimecast-MFC-AGG-ID: 76rEkok2MhG-UqD8p7pvmg_1763197949 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de Subject: [PATCH 2/3] migration: Use warn_reportf_err() where appropriate Date: Sat, 15 Nov 2025 09:34:59 +0100 Message-ID: <20251115083500.2753895-3-armbru@redhat.com> In-Reply-To: <20251115083500.2753895-1-armbru@redhat.com> References: <20251115083500.2753895-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763197982604158500 Content-Type: text/plain; charset="utf-8" Replace warn_report("...: %s", ..., error_get_pretty(err)); by warn_reportf_err(err, "...: ", ...); Prior art: commit 5217f1887a8 (error: Use error_reportf_err() where appropriate). Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas --- migration/multifd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index a529c399e4..6210454838 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -464,8 +464,8 @@ static void migration_ioc_shutdown_gracefully(QIOChanne= l *ioc) */ migration_tls_channel_end(ioc, &local_err); if (local_err) { - warn_report("Failed to gracefully terminate TLS connection: %s= ", - error_get_pretty(local_err)); + warn_reportf_err(local_err, + "Failed to gracefully terminate TLS connection: "); } } =20 --=20 2.49.0 From nobody Mon Feb 9 08:51:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763197980; cv=none; d=zohomail.com; s=zohoarc; b=VTR8+38Aj4oTosJtqcwJVwpP6oKhZXHbPQ1mGmuccvTwB0t0VLeypA3Budti4hq7WUy8pIEAW6XgGAQmRO4J0MTLG1Gq8b6U4nxcL3K+B7l6P8aG609RXIol+m2D4EpDqlMkDFYPJaGAqZx7aarpzbBnI+QKpf/1LNtQ1VFHfrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763197980; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=puRzXfg+J7NKyJ7yKSVGHp7VlYWRBRXQdELDHyqoYQ4=; b=eEqZ+PW2QINBkRBCToaMsURlksfM24I6sFC8gYtuM0MR2WR1T7r/ordI7PjXb5PEOzRCF/5Ebnh6jKxggEG0av2BZGBWBHjL6WchPWSmHW+ZZkzCSwTbAl5FZLG1/T9KQURkeeJS69SM6ltg9Tlfn2VIXjstANVPcd044ivyiG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763197980176149.71260176194323; Sat, 15 Nov 2025 01:13:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vKCKq-00058o-DD; Sat, 15 Nov 2025 04:12:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKj-0004tT-Nw for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vKCKi-0005VR-8p for qemu-devel@nongnu.org; Sat, 15 Nov 2025 04:12:37 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-MIvM-qklNDm1Z10JP1KV4w-1; Sat, 15 Nov 2025 04:12:32 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C349180064E; Sat, 15 Nov 2025 08:35:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1450219540DF; Sat, 15 Nov 2025 08:35:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1C08221E6617; Sat, 15 Nov 2025 09:35:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763197955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=puRzXfg+J7NKyJ7yKSVGHp7VlYWRBRXQdELDHyqoYQ4=; b=irZ7/TpXEE/+slrDMpw/KzsRvsC2XUP5hiTw0XHDeEUWc3LNdWO3FyKwpfmDpBQtmZrGmT cMNpwJoTTS14DApzzvcKLCxFRkbgizAFA/3MvEAvNGAxUHI9I8IW7tnf3YYUhPDO+XExOV I8nY37fv0ps9Sn3v+zaZcln+e1cf8YU= X-MC-Unique: MIvM-qklNDm1Z10JP1KV4w-1 X-Mimecast-MFC-AGG-ID: MIvM-qklNDm1Z10JP1KV4w_1763197951 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de Subject: [PATCH 3/3] migration/postcopy-ram: Improve error reporting after loadvm failure Date: Sat, 15 Nov 2025 09:35:00 +0100 Message-ID: <20251115083500.2753895-4-armbru@redhat.com> In-Reply-To: <20251115083500.2753895-1-armbru@redhat.com> References: <20251115083500.2753895-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763197982720158500 Content-Type: text/plain; charset="utf-8" One of two error messages show __func__. Drop it; it doesn't help users, and developers can grep for the message. This also permits de-duplicating the code to prepend to the error message. Both error messages show a numeric error code. I doubt that's helpful, but I'm leaving it alone. Use error_append_hint() for explaining that some dirty bitmaps may be lost. Polish the prose. Don't faff around with g_clear_pointer(), it's not worth its keep here. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas --- migration/postcopy-ram.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 3f98dcb6fd..7c9fe61041 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -2146,25 +2146,24 @@ static void *postcopy_listen_thread(void *opaque) if (load_res < 0) { qemu_file_set_error(f, load_res); dirty_bitmap_mig_cancel_incoming(); + error_prepend(&local_err, + "loadvm failed during postcopy: %d: ", load_res); if (postcopy_state_get() =3D=3D POSTCOPY_INCOMING_RUNNING && !migrate_postcopy_ram() && migrate_dirty_bitmaps()) { - error_report("%s: loadvm failed during postcopy: %d: %s. All s= tates " - "are migrated except dirty bitmaps. Some dirty " - "bitmaps may be lost, and present migrated dirty " - "bitmaps are correctly migrated and valid.", - __func__, load_res, error_get_pretty(local_err)); - g_clear_pointer(&local_err, error_free); + error_append_hint(&local_err, + "All state is migrated except dirty bitmaps." + " Some dirty bitmaps may be lost, but any" + " migrated dirty bitmaps are valid."); + error_report_err(local_err); } else { /* * Something went fatally wrong and we have a bad state, QEMU = will * exit depending on if postcopy-exit-on-error is true, but the * migration cannot be recovered. */ - error_prepend(&local_err, - "loadvm failed during postcopy: %d: ", load_res); migrate_set_error(migr, local_err); - g_clear_pointer(&local_err, error_report_err); + error_report_err(local_err); migrate_set_state(&mis->state, mis->state, MIGRATION_STATUS_FA= ILED); goto out; } --=20 2.49.0