From nobody Sat Nov 15 07:43:00 2025 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1753909828; cv=none; d=zohomail.com; s=zohoarc; b=S64rJk16lXDUHQxqmBO9PpxOHgsS4ih8ydV5g5CBXsLbrnEpMzcZPOiRjsRLcSMxQcVTZ7ziCQAtYgXiqr7UI2niND6wEKchUlYUj2sfMH9X84QKpUZhG8gJnO/mazHii0bSxWZNKFmLU2/dxBlYWt+samGFS4pzOlo1L5l5qUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753909828; 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=GaZ+Yz+zcCEr2tVtA+J5m5quEPo6bIi7orrs7mVcXNo=; b=KdMO4yKtf2dV/XNmqN3ZGLxh0cMQIlS7+ogTkU4HEdmHG1ndLBmWcAiiKp4kmAxZ4Rj5Vu/IsSiPJ6hHxV4QULnIkrQNTRIXFpzjp+TMZwEFIIJSlWveIU22ChzPRN3OIRTW2Kib1szL5oylPnUo/I0m7jZQ7lusGUHbXuTtCJs= 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 17539098280871015.8264711987171; Wed, 30 Jul 2025 14:10:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhE3P-00029V-8o; Wed, 30 Jul 2025 17:09:39 -0400 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 1uhDnD-0004PZ-KW for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:52:55 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhDnB-0002Iw-L1 for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:52:55 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4B1591F76C; Wed, 30 Jul 2025 20:52:51 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0734313A50; Wed, 30 Jul 2025 20:52:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id YEynLiGGimjhPwAAD6G6ig (envelope-from ); Wed, 30 Jul 2025 20:52:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908771; h=from:from:reply-to: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=GaZ+Yz+zcCEr2tVtA+J5m5quEPo6bIi7orrs7mVcXNo=; b=XPniET5MoLUt+5GlUWuJnU09nHdPIs+J8gMzVFMn1I8XiVoqh0P7ETn7AZ40xo5hN32NNj vLxhNVgA+v3H2pAYTG8fXWPcfPvFn/ourd6JZ2Gal4vl6lybRuyFtRESgIl+46rYdU+S2m pk01MjWUUMK2agXlQcUX+GCllrZ51k4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908771; h=from:from:reply-to: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=GaZ+Yz+zcCEr2tVtA+J5m5quEPo6bIi7orrs7mVcXNo=; b=3Nk1oLIRKcNGV/RNIranxFQxfnDIeomnKZGzhqQu1fCiWv90xFbSjW+EbKL15tGuT/34su GzFsogC9vodsQYDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908771; h=from:from:reply-to: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=GaZ+Yz+zcCEr2tVtA+J5m5quEPo6bIi7orrs7mVcXNo=; b=XPniET5MoLUt+5GlUWuJnU09nHdPIs+J8gMzVFMn1I8XiVoqh0P7ETn7AZ40xo5hN32NNj vLxhNVgA+v3H2pAYTG8fXWPcfPvFn/ourd6JZ2Gal4vl6lybRuyFtRESgIl+46rYdU+S2m pk01MjWUUMK2agXlQcUX+GCllrZ51k4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908771; h=from:from:reply-to: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=GaZ+Yz+zcCEr2tVtA+J5m5quEPo6bIi7orrs7mVcXNo=; b=3Nk1oLIRKcNGV/RNIranxFQxfnDIeomnKZGzhqQu1fCiWv90xFbSjW+EbKL15tGuT/34su GzFsogC9vodsQYDQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell Subject: [RFC PATCH 1/3] target/arm: Fix migration to QEMU 10.1 Date: Wed, 30 Jul 2025 17:52:43 -0300 Message-Id: <20250730205245.2118-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250730205245.2118-1-farosas@suse.de> References: <20250730205245.2118-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: 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 @suse.de) X-ZM-MESSAGEID: 1753909829821116600 Content-Type: text/plain; charset="utf-8" The DBGDTRTX register definition was removed from cpu->cp_regs in the 10.1 cycle. This breaks migration from QEMU versions < 10.1 due to the present of an extra, unknown (to 10.1) register in the migration stream. Change the cpu_post_load validation code to recognise that the register has been removed and ignore it when present in the stream. Keep a compatibility list with the registers that should be ignored when sent from versions older than 10.1. The value of the cpregs hashtable key is used because it can be derived on the destination (where this patch applies) from the cpreg_vmstate_indexes array. Note that this solution is *not* generic for other QEMU versions moving forward, this is a stop gap to avoid machines being stuck in QEMU < 10.1 without a migration path. A proper solution would include versioning of the register list and recognizing any registers removed/changed. Fixes: 655659a74a ("target/arm: Correct encoding of Debug Communications Ch= annel registers") Signed-off-by: Fabiano Rosas --- Will an older guest using the register have issues after migration once the register gets set to its default value? --- target/arm/machine.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index 6986915bee..2d4df53817 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -8,6 +8,7 @@ #include "cpu-features.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" +#include "target/arm/cpregs.h" #include "target/arm/gtimer.h" =20 static bool vfp_needed(void *opaque) @@ -868,6 +869,14 @@ static const VMStateInfo vmstate_powered_off =3D { .put =3D put_power, }; =20 +static uint64_t compat_cpreg_keys_virt_10_0[] =3D { + /* + * { .name =3D "DBGDTRTX", .state =3D ARM_CP_STATE_AA32, + * .cp =3D 14, .crn =3D 0, .crm =3D 5, .opc1 =3D 3, .opc2 =3D 0 } + */ + ENCODE_CP_REG(14, 0, 1, 0, 5, 3, 0), +}; + static int cpu_pre_save(void *opaque) { ARMCPU *cpu =3D opaque; @@ -951,7 +960,7 @@ static int cpu_post_load(void *opaque, int version_id) { ARMCPU *cpu =3D opaque; CPUARMState *env =3D &cpu->env; - int i, v; + int i, j, v; =20 /* * Handle migration compatibility from old QEMU which didn't @@ -987,10 +996,23 @@ static int cpu_post_load(void *opaque, int version_id) } if (cpu->cpreg_vmstate_indexes[v] < cpu->cpreg_indexes[i]) { /* register in their list but not ours: fail migration */ + + for (j =3D 0; j < ARRAY_SIZE(compat_cpreg_keys_virt_10_0); j++= ) { + if (cpu->cpreg_vmstate_indexes[v] =3D=3D + cpreg_to_kvm_id(compat_cpreg_keys_virt_10_0[j])) { + /* + * ...unless the extra register is being explicitly + * ignored for migration compatibility purposes. + */ + i--; + goto next; + } + } return -1; } /* matching register, copy the value over */ cpu->cpreg_values[i] =3D cpu->cpreg_vmstate_values[v]; + next: v++; } =20 --=20 2.35.3 From nobody Sat Nov 15 07:43:00 2025 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1753909798; cv=none; d=zohomail.com; s=zohoarc; b=QaEl+8RQjnC992dWTczmmO57+z5b2J/uvU91rYdAib8K6MCztnFkrxpbbfeKL27Lh8SuGTy3vhC1zLE3W4f1PEwas8nWdEgvw1a3s6m43Ft6pRGaQF38l28SsmD6sFsi+/hefszFc7pZmOZxLGICCLOI9r4iYHVd6Yd0h9+/uYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753909798; 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=N/koInHJHB0Tawbx0b6/y9YWT+/bGQdyeF0S1AcZL7Y=; b=dKObNTTcZZz4GpKeYOTBJzujuWFGf/xd4BSc7fAPykzuTlBeI9xgDByVSuPEwZclCTjkuAZ3lvs5EYrNsY2T3CTXyybp3NeawcnvyzCG4KHY3DkRujY25sRyJdedtIr8+diQk7aAqjSJHGCNq4LzBr+c3SmL9iw+UuiHpYuoiiE= 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 17539097980121015.5850332283658; Wed, 30 Jul 2025 14:09:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhE3T-0002MK-1N; Wed, 30 Jul 2025 17:09:43 -0400 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 1uhDnK-0005DX-K5 for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:53:02 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhDnH-0002L5-Tc for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:53:02 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 874A11F7B6; Wed, 30 Jul 2025 20:52:53 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C317B1388B; Wed, 30 Jul 2025 20:52:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id EB/iICOGimjhPwAAD6G6ig (envelope-from ); Wed, 30 Jul 2025 20:52:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908773; h=from:from:reply-to: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=N/koInHJHB0Tawbx0b6/y9YWT+/bGQdyeF0S1AcZL7Y=; b=KJTag24rdrpL+ljSM2CUMW5auXH/8bvNzr+voa7d2uHE3iwlTvELIvN2wn6GpAKkrFubZP 7RTCj2eIZx/R3+48lgwUJTjSTJ0rOifNAcx05OeuCtAIVzkaiF2/JoedoTjxAOZ8s+rh4L 8ivr68u0s3Uu3I6QoVp70szZr1VyLwk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908773; h=from:from:reply-to: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=N/koInHJHB0Tawbx0b6/y9YWT+/bGQdyeF0S1AcZL7Y=; b=ZNlUpHuZX5siscSvdi+WsdvSIxux1N40zvfPhpgQcNd1ru8Kv8oYWqxmwKypDIz7D17tsN OTAgVaIfX88WOKCQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908773; h=from:from:reply-to: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=N/koInHJHB0Tawbx0b6/y9YWT+/bGQdyeF0S1AcZL7Y=; b=KJTag24rdrpL+ljSM2CUMW5auXH/8bvNzr+voa7d2uHE3iwlTvELIvN2wn6GpAKkrFubZP 7RTCj2eIZx/R3+48lgwUJTjSTJ0rOifNAcx05OeuCtAIVzkaiF2/JoedoTjxAOZ8s+rh4L 8ivr68u0s3Uu3I6QoVp70szZr1VyLwk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908773; h=from:from:reply-to: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=N/koInHJHB0Tawbx0b6/y9YWT+/bGQdyeF0S1AcZL7Y=; b=ZNlUpHuZX5siscSvdi+WsdvSIxux1N40zvfPhpgQcNd1ru8Kv8oYWqxmwKypDIz7D17tsN OTAgVaIfX88WOKCQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , Laurent Vivier , Paolo Bonzini Subject: [RFC PATCH 2/3] tests/qtest/migration: Only test aarch64 on TCG Date: Wed, 30 Jul 2025 17:52:44 -0300 Message-Id: <20250730205245.2118-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250730205245.2118-1-farosas@suse.de> References: <20250730205245.2118-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,linaro.org:email]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: 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 @suse.de) X-ZM-MESSAGEID: 1753909799725116600 Content-Type: text/plain; charset="utf-8" Currently our aarch64 tests are only being run using identical QEMU versions. When running the tests with different QEMU versions, which is a common use-case for migration, the tests are broken due to the current choice of the 'max' cpu, which is not stable and is prone to breaking migration. This means aarch64 tests are currently only testing about the same situations as any other arch, i.e. no arm-specific testing is being done. To make the aarch64 tests more useful, -cpu max will be changed to -cpu neoverse-n1 in the next patch. Before doing that, make sure aarch64 tests only run with TCG, since KVM testing depends on usage of the -cpu host and we currently don't have code to switch between cpus according to test runtime environment. Also, TCG alone should allow us to catch most issues with migration, since there is no guarantee of a uniform environment as there is with KVM. Suggested-by: Peter Maydell Signed-off-by: Fabiano Rosas --- tests/qtest/migration/framework.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 407c9023c0..f09365d122 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -353,8 +353,17 @@ int migrate_start(QTestState **from, QTestState **to, = const char *uri, memory_backend =3D g_strdup_printf("-m %s ", memory_size); } =20 - if (args->use_dirty_ring) { - kvm_opts =3D ",dirty-ring-size=3D4096"; + + if (g_str_equal(arch, "aarch64")) { + /* + * aarch64 is only tested with TCG because there is no single + * cpu that can be used for both KVM and TCG. + */ + kvm_opts =3D NULL; + } else if (args->use_dirty_ring) { + kvm_opts =3D "-accel kvm,dirty-ring-size=3D4096"; + } else { + kvm_opts =3D "-accel kvm"; } =20 if (!qtest_has_machine(machine_alias)) { @@ -368,7 +377,7 @@ int migrate_start(QTestState **from, QTestState **to, c= onst char *uri, =20 g_test_message("Using machine type: %s", machine); =20 - cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg " + cmd_source =3D g_strdup_printf("%s -accel tcg " "-machine %s,%s " "-name source,debug-threads=3Don " "%s " @@ -395,7 +404,7 @@ int migrate_start(QTestState **from, QTestState **to, c= onst char *uri, */ events =3D args->defer_target_connect ? "-global migration.x-events=3D= on" : ""; =20 - cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg " + cmd_target =3D g_strdup_printf("%s -accel tcg " "-machine %s,%s " "-name target,debug-threads=3Don " "%s " --=20 2.35.3 From nobody Sat Nov 15 07:43:00 2025 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1753909804; cv=none; d=zohomail.com; s=zohoarc; b=DO+nzOTEd6fdjSw0oQ5WVpoGN0WDx1Gm51pYunOqSrDy9WMHQPgs+KAOZ6vF37E5RXAJo9RD1EUt8eFhYtvpBdwuKk3zOhHm9sOC95jxME3+hNLL4J6qhGJZ8ONA6z8XAzEdjZpIwY9hM3O5cMgjdPVODR55dXR2qRNjkNLLww8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753909804; 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=9mvAK13csHDmCuOUzgOY3VlFF/M5p9fdzTneHoaOUFg=; b=NvFGQzkahP1R9aU+nT8CdjJtybU7ja0sfgxcxGUcQuyXQh0XZgUKu1kSuVziMRBA0BVA0cdfOujx4fSgdlTPdyGjg885b6RK+3kFL0im1gtHmSAvrHPB7qIy0fLILcWU99ld7R0x3jrFxUKEgUEoV8g59P8OqRQvsZiIROi5POA= 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 1753909804891661.8620463095008; Wed, 30 Jul 2025 14:10:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhE3S-0002Lw-CR; Wed, 30 Jul 2025 17:09:42 -0400 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 1uhDnJ-00056u-Bt for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:53:01 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhDnH-0002Kr-NS for qemu-devel@nongnu.org; Wed, 30 Jul 2025 16:53:01 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C79C021A78; Wed, 30 Jul 2025 20:52:55 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0F9581388B; Wed, 30 Jul 2025 20:52:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4DapMCWGimjhPwAAD6G6ig (envelope-from ); Wed, 30 Jul 2025 20:52:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908775; h=from:from:reply-to: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=9mvAK13csHDmCuOUzgOY3VlFF/M5p9fdzTneHoaOUFg=; b=ZjkPAyBaXTAo1kTxJi+dZkSnC3UqQL1GSSNJuvZauCVdLpsDdyiCKw5dGAmO/KKLX2aGUt zEVXy56nJwypaPv50W4FWqxDONIWeqFTvKEFhwGlvZhBEvzLs2ZlKFMO/qnQzv1IAkYHWS 3axFpL64t61g1I607ytT9pDFSVqTo2c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908775; h=from:from:reply-to: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=9mvAK13csHDmCuOUzgOY3VlFF/M5p9fdzTneHoaOUFg=; b=ovrrlms52T1MlDbsryD4vQN7uIWCdExsyG1BUhU1RgVL9zL0gR+AeZMwNp9kVZPR4USuAs TbGnxFyLCmm6lRDw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ZjkPAyBa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ovrrlms5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1753908775; h=from:from:reply-to: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=9mvAK13csHDmCuOUzgOY3VlFF/M5p9fdzTneHoaOUFg=; b=ZjkPAyBaXTAo1kTxJi+dZkSnC3UqQL1GSSNJuvZauCVdLpsDdyiCKw5dGAmO/KKLX2aGUt zEVXy56nJwypaPv50W4FWqxDONIWeqFTvKEFhwGlvZhBEvzLs2ZlKFMO/qnQzv1IAkYHWS 3axFpL64t61g1I607ytT9pDFSVqTo2c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1753908775; h=from:from:reply-to: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=9mvAK13csHDmCuOUzgOY3VlFF/M5p9fdzTneHoaOUFg=; b=ovrrlms52T1MlDbsryD4vQN7uIWCdExsyG1BUhU1RgVL9zL0gR+AeZMwNp9kVZPR4USuAs TbGnxFyLCmm6lRDw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , Laurent Vivier , Paolo Bonzini Subject: [RFC PATCH 3/3] tests/qtest/migration: Change cpu for aarch64 Date: Wed, 30 Jul 2025 17:52:45 -0300 Message-Id: <20250730205245.2118-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250730205245.2118-1-farosas@suse.de> References: <20250730205245.2118-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: C79C021A78 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Score: -3.01 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: 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 @suse.de) X-ZM-MESSAGEID: 1753909805817116600 Content-Type: text/plain; charset="utf-8" Don't use the 'max' cpu for migration testing of aarch64. That cpu does not provide a stable set of features and is expected to break migration from time to time. Signed-off-by: Fabiano Rosas --- tests/qtest/migration/framework.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index f09365d122..6d980b6b51 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -317,7 +317,7 @@ int migrate_start(QTestState **from, QTestState **to, c= onst char *uri, memory_size =3D "150M"; machine_alias =3D "virt"; machine_opts =3D "gic-version=3D3"; - arch_opts =3D g_strdup_printf("-cpu max -kernel %s", bootpath); + arch_opts =3D g_strdup_printf("-cpu neoverse-n1 -kernel %s", bootp= ath); start_address =3D ARM_TEST_MEM_START; end_address =3D ARM_TEST_MEM_END; } else { --=20 2.35.3