From nobody Sun Apr 12 00:55:23 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=1772548837; cv=none; d=zohomail.com; s=zohoarc; b=MK4hK0CTFLPdx1VLtR4KnNJc3dGTSIb+P8nMcdMVbjbd8OR5iZOxtVjc6PuxXsZiHTa3b73BLkpX6MQI7OHgMjISty0CVPmiPXMMfFt/nPLWobT7WcRh+ZNrBYlKCpTHZtyZmftry/+fK+oeT8Dq+fLRT/N46sHylBSjNXUVej4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772548837; h=Content-Transfer-Encoding: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:Cc; bh=oJHnFlbisgEtfr+pa9NG0vrx4X448WVIRora0FKjQFI=; b=an0YuHio87v7a00r4bvTfPtjIXfWYIBPKnS5zPGVWRs7VAkbv0XLNGThohnyTW45o71iBX2Ss09Bvub6cbyEuz6YTXRpulM2rjnwBUh4CS2W8Ptm0vPzhVw7UNiK5M0ZGJtTwD33j/MlAkbkOULo6akfLBgXB4QlzFNekR7zlX8= 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 1772548837804710.7214434810204; Tue, 3 Mar 2026 06:40:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxQus-0001fH-Bn; Tue, 03 Mar 2026 09:40:06 -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 1vxQuq-0001eo-F8 for qemu-devel@nongnu.org; Tue, 03 Mar 2026 09:40:04 -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 1vxQuo-0002Dk-5q for qemu-devel@nongnu.org; Tue, 03 Mar 2026 09:40:04 -0500 Received: from mx-prod-mc-01.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-34-GA67AYOvPyCz0FgmPNKzlg-1; Tue, 03 Mar 2026 09:39:57 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49BFC1956055; Tue, 3 Mar 2026 14:39:56 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.89]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4543930001B9; Tue, 3 Mar 2026 14:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772548800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oJHnFlbisgEtfr+pa9NG0vrx4X448WVIRora0FKjQFI=; b=SCVuJgxTW5mpQ6uchnC/fVR9ZXdz/7rOfU1pZYNgq9jW04LAtWEuzunMZvmj3zcsS2bMB5 jAFl3/OE6NGCg5BlFRpI0V1G1/ax27q9Mli+kHQdoOD4cQRT3CEaopZbYNX3L5A7+5/apu CWR0xmzOjhElCPpQ5gHpdryvlesznw8= X-MC-Unique: GA67AYOvPyCz0FgmPNKzlg-1 X-Mimecast-MFC-AGG-ID: GA67AYOvPyCz0FgmPNKzlg_1772548796 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, cohuck@redhat.com, sebott@redhat.com, peterx@redhat.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v2 6/7] target/arm/machine: Trace all register mismatches Date: Tue, 3 Mar 2026 15:36:38 +0100 Message-ID: <20260303143928.1747116-7-eric.auger@redhat.com> In-Reply-To: <20260303143928.1747116-1-eric.auger@redhat.com> References: <20260303143928.1747116-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.322, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.141, 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: qemu development 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: 1772548840045158500 Content-Type: text/plain; charset="utf-8" At the moment, cpu_post_load() exists with error on the first catch of unexpected register in the incoming stream. Let the code go further and trace all the issues before exiting. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell --- target/arm/machine.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index 7dd649e8f64..13f3955be67 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1058,6 +1058,7 @@ static int cpu_post_load(void *opaque, int version_id) { ARMCPU *cpu =3D opaque; CPUARMState *env =3D &cpu->env; + bool fail =3D false; int i, v; =20 trace_cpu_post_load(cpu->cpreg_vmstate_array_len, @@ -1090,13 +1091,14 @@ static int cpu_post_load(void *opaque, int version_= id) */ =20 for (i =3D 0, v =3D 0; i < cpu->cpreg_array_len - && v < cpu->cpreg_vmstate_array_len; i++) { + && v < cpu->cpreg_vmstate_array_len;) { if (cpu->cpreg_vmstate_indexes[v] > cpu->cpreg_indexes[i]) { g_autofree gchar *name =3D print_register_name(cpu->cpreg_inde= xes[i]); =20 warn_report("%s: %s " "expected by the destination but not in the incomi= ng stream: " "skip it", __func__, name); + i++; continue; } if (cpu->cpreg_vmstate_indexes[v] < cpu->cpreg_indexes[i]) { @@ -1104,12 +1106,18 @@ static int cpu_post_load(void *opaque, int version_= id) =20 error_report("%s: %s in the incoming stream but unknown on the= destination: " "fail migration", __func__, name); - return -1; + v++; + fail =3D true; + continue; } /* matching register, copy the value over */ cpu->cpreg_values[i] =3D cpu->cpreg_vmstate_values[v]; + i++; v++; } + if (fail) { + return -1; + } =20 if (kvm_enabled()) { if (!kvm_arm_cpu_post_load(cpu)) { --=20 2.53.0