From nobody Mon Apr 13 13:47:56 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772809415; cv=none; d=zohomail.com; s=zohoarc; b=jT0uL4hJnd3dd+TLfso7+EhU1U4/ZUDKQarr+Zr2vTa6hADSF2vcjZLmHLybW0tEC3gA0lupCdiYmPkE9t17dzNl+6ScX15Yw3tcpvwJIYUxMfEEiVSxgTu0jYCzAkbjljOiGJmuM/JdqJPo3Pb4J58XJy9ot9rqxc8UoA34enI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772809415; 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=johyxWgACHRod1tW8e+D3L9ds2TR7uVcjXlXo3awJiM=; b=UL2YKjC9lOZx6Fwxn3EdBfxua8PqOQo4bf4JK9EKPwwM1ystlieEy/h/Yb2vCC16wH57DpsJtsZb4VTcNeA9Qe6xN5rfdYonldgGcyP2DuWT4N5f6nMypTB0MY9/7Wn8q+aZPv83LKm8nhSh2+7KA5dxhDHr/IOO0TQ1r3bJBIY= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772809415056351.6524074632215; Fri, 6 Mar 2026 07:03:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyWep-00044e-Hw; Fri, 06 Mar 2026 10:00:03 -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 1vyWeo-00041j-40 for qemu-devel@nongnu.org; Fri, 06 Mar 2026 10:00:02 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyWem-0002R8-HG for qemu-devel@nongnu.org; Fri, 06 Mar 2026 10:00:01 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-439d8dc4ae4so898319f8f.2 for ; Fri, 06 Mar 2026 07:00:00 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485246ece8bsm28681845e9.4.2026.03.06.06.59.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 06:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772809199; x=1773413999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=johyxWgACHRod1tW8e+D3L9ds2TR7uVcjXlXo3awJiM=; b=MmnLOeifFgM7jVRs0oHV00X1ymyUVo2YynkFOvdauMkTxDE98hYEVDdr3Z0DBm7xR3 8QEpchGywdzMKzVzhJjU9D5YGHq+bfbMKUUxVDz9dihmk8AXRpecGsIvzHE3J2mBVsik DighV1tXlVyTtcU0L/5Tk2IUOeJ2Y9ngoXeISzQgQZ/4W40clysJeXWsLEqlUhj4lUrQ WuFbe/1o0rOw6IFpydIhGPRvIxmU2EGimidkNt9uj0ZhY5DbxU/5Bto7r773eSk9eXYQ AAadyLvVp3z2fNXkvsYzIf7aoTYih7NdlZUV92h1lbZ/xpLztnntOjQILLmA+KiVKYE2 M3Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772809199; x=1773413999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=johyxWgACHRod1tW8e+D3L9ds2TR7uVcjXlXo3awJiM=; b=khruUJqcnE3xwQyZrOxOjfSuf/++sAlIJfUqWYWcpA7/WjIxdau1f9T3WffmDx9IR6 23jV7tyUbZykPUAxxSNB4VarXDCx1Zn9+TYrAvb+d8+m7CMpb/wukUKdRniIYDfBR3hf TMgHjWNMXexMi98NCtff92q6hCdjs+b2BSJwGFxauGe+rsZEwNajb3mEdsq1z7WgEjlV qBqRKNRMcXFzKAzUlI5TrTN5IFDzCSCk3nwnEGDE9nZ4zcb5Rilb8dYA0f5N7w4JXX9z a0X1jTPTu4Vc3MflsXQgQVBSMvQSgN2muncLqqcgvANHEqtG4D5bqgAgujZFzaaQZiqb A8oQ== X-Gm-Message-State: AOJu0Yy0v4Sp+v/EMApFTrwf1VTkHG3NXqvjEjr9/DRKcXIJt2khetJ9 4+7s5RnxrpQbFY5PLe3/zc9jloVl+XgzN94/D3yY6cXuberzqOW+P4MOKBZQJfGeBDx8JJNjZvn EkHaU X-Gm-Gg: ATEYQzxGAuoexn3EagCwfcNfVkDQTPs2AdXbg5WyRFg9iVRXJziMuYGWHedClwVJGl+ gl0RbY/NYyX3buG1UEpCxviQSdEx/b0dcqUtkQotO9yxoV+W5sRMC8tjwr0sFmTrV/IJlEUWNh6 Jw300Oss/+nfe97mWr35YvlB0AnoZAMXvkspY4EgyT2YExG4UaEEL6LSBY28ZFNe727J35hdpQq g9JYDjePXlF+5RJi9n7G4CfAXx8EuR9orKQ3wR42G4xYXY4cZn4i2zC2roUtwfA2UWrXRNFFEtj pn7us5q7pGVLMv31n0ZecDt9Jww28fIfLkm/IYF6DGquAR4sC5sDnouELqVyAs0apQqUjSHZrT7 /FYqKQ+K3RMOmz0QRio+1XlvPl5xI1ma+h/xuNXUONNRWDSG08+w5KbxRDVN0/ib/FuJJMS1Cto 9Xo9u0TJVA22wdO4dCCDT+yy2TVKbfrvhHmwWBNJUWYCjQY1SG7eJJBQN6PB5zboN5UTNHHKFmk 7qOFF9OC1JPgkTHSdi7HkTW3oyVKvg= X-Received: by 2002:a05:600c:c4a5:b0:46f:c55a:5a8d with SMTP id 5b1f17b1804b1-485269199c0mr33306305e9.4.1772809199068; Fri, 06 Mar 2026 06:59:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/49] target/arm/machine: Trace all register mismatches Date: Fri, 6 Mar 2026 14:59:09 +0000 Message-ID: <20260306145939.2162189-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306145939.2162189-1-peter.maydell@linaro.org> References: <20260306145939.2162189-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: 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 @linaro.org) X-ZM-MESSAGEID: 1772809416605154100 Content-Type: text/plain; charset="utf-8" From: Eric Auger At the moment, cpu_post_load() exits 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 Message-id: 20260304101625.1962633-7-eric.auger@redhat.com Signed-off-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 d9b65b5eed..4d9158e697 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1061,6 +1061,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, @@ -1093,13 +1094,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]) { @@ -1107,12 +1109,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.43.0