From patchwork Sun May 4 05:29:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887196 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1493979wrq; Sat, 3 May 2025 22:43:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVSZoatZgQdoJl3rS6L6D9TSlfkGKlA1TBVD01flrxG26OPuRN+o2xD5TH/IMK5a9TIisswqQ==@linaro.org X-Google-Smtp-Source: AGHT+IE78B2XfHDKtDu4ibXJHYMbSxJWPolk/16wIFAkcAL/nYRwWi3GViR4d3SOYf0wGsFTfROa X-Received: by 2002:a05:622a:11c5:b0:48a:582a:64f6 with SMTP id d75a77b69052e-48e00f625cdmr34052141cf.40.1746337432634; Sat, 03 May 2025 22:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746337432; cv=none; d=google.com; s=arc-20240605; b=KuF761lskD5mhR+ibJRxAlq1NyGE+AQqD91EUiVSc1R1AAx4z2qyYRrZBpJexqIW/r pmdGjdHGXIL7GhKfx16iBE5JQmDXW65gU2RZZ4Q0th81DdBLurEt41GBC03ErtbEAB2f midVJ7Js6vb9HXCQWBXM+Eb87D6lGnG27ZMJoRKZ/5tUiha1317o798xreniup+k6pse j9WOhQgf4ZdEKK6Hd//u2A0mlwW+K8hxL2PBcN5dpW9HIB3xPyW6k9fmWj+ADj1rr9dL CpRWnpsFaOk4gxyx91aWTqTSACdq/OarzHGxwKpJ+9lNO70gQ67/oLutv+IIebiz9Dnd wteg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Dgq1OA4KuFLS5XceK9ZkHI9zBCVx2Be38qBE8eQ0ZbQ=; fh=02AUoSaH/mYMQTzo2+A6j8m/qDfXAxVzTrBZ7wPvRqc=; b=Na6LPtlxbj8tX4hELAtexxuRVTS8j3QE8TjX2Rze7BWEObgnmi0Mj8TdI7HP1JsqI1 Ire8q70o4pixTwnXzBBugVzJ1TVMfs5qK4vjfZSZalP809oTnOBA0GjoDQZ7iPhFwr9n CUJqHOH2eKt2HyrGNx+2haxgUYM2jPzSSFvNCnSsleoHry3noBKtRM5khcvkyNpnTUty 6Ent/sGTOUaXnblEkUVEQe1LqmLHhPSiiKvbY5IqwChg4QQWKUohh4sAz+iSo+xrayVy 53WCBsgXxp0JRAnph/kQUBDvLMVdNup/5Ktil53g6geEL83nV0bz4qrN/kMyG1CuSLuQ p0iQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jKeAFxII; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b990fd5f9si65756361cf.659.2025.05.03.22.43.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 May 2025 22:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jKeAFxII; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBRvU-0002YZ-F7; Sun, 04 May 2025 01:30:08 -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 1uBRvH-0002Nc-IQ for qemu-devel@nongnu.org; Sun, 04 May 2025 01:29:55 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBRvF-0004TO-Ox for qemu-devel@nongnu.org; Sun, 04 May 2025 01:29:55 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22e15aea506so21472505ad.1 for ; Sat, 03 May 2025 22:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746336592; x=1746941392; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dgq1OA4KuFLS5XceK9ZkHI9zBCVx2Be38qBE8eQ0ZbQ=; b=jKeAFxIIUDg1mx6rApIY4i02KjcKxdU8Dkj9f30DCeRa5UdpK2IYqXNf3SA0RXKmxN h635BTe+DSdeUnTaOfIEnD/R+Mr5etN0MX+wh2FupAruiY4rxJww9Gq6aUaeKPKCLA1s PzfuEJP1TZSkMw0T9/+Fmv7WMhlWyAVHRrzZ0R8OLvn1mCqei9hClf9mcurttpACLfTX k0TiJ7/QRO0X9TJ0NNrod6Nz0TWZoqtDZhtPkjY4amr/z77Id8dEwqIuIII7cwHc6Ds5 yw8Yzgfzfc7SDKhr8PL4nviJART1EcAhuMmQz2OY21T3QZFxOY5gbOuKi7140hr9SKsm hdLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746336592; x=1746941392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dgq1OA4KuFLS5XceK9ZkHI9zBCVx2Be38qBE8eQ0ZbQ=; b=oQkRozoFaK4tbvSYuqd3rTOPksJM/PE0/vTzPY7YsV+YheQUCZ6T+pMZfo+GqNKtwk nGhOEantvYphMtzZzlC1UDNCaX/RaGREF5sYGibNSEdK8HGfZq3qT8AQEabzIG2sMGWU O6jKDEFrcytSMp/wDVJ8G+pQ2195F3nrkaZdpL6p6xdHQ8rPT1Q8hBvYTveYAXf2UsDm orTTiFdKQ6JxlSwVoYfMceahZQHwWBf7TKhTAEhARF17+qlOuADWMEsvbycgL/QrLROL qh9ajN3D2heemQjVvgZnb+KItwrka02Kfi6xmqHwCJ3NJVrpp16BZ+wClb0S7g3S39Yp Up8Q== X-Gm-Message-State: AOJu0Yy5OrSigDMAt9F1FYg0+viPCK0K5NQpEv36cTkH3GDTiOaw0K1P BYbVdgrZUxwR1d2oFG1uvcY9lfLtp0GRURqwL+zRl92z3N5lNrkrrTAgjLA2tfUQDRc0pTjTv+M haYM= X-Gm-Gg: ASbGnct2kbSBUUdeAe8Coxq54FV6lQObnNrCF1/u4bddikPRyfW2ud5SoXjfXf22qY/ PMvEXYlVfTbi2Tr6PbhVWvIw2u/oN8hs0xgLisjX9PDdSNdpZdcEikMntHBui/zbVz2W7Aaw8vo M0L8C8NWXix45FDwpq1hjRIIEyMtqzRxe68MjrAXMCGdZYs+KM6dBsyYBmk7WyMrlpGu5Ej0woQ /3D/pcM1Z1Q6ouKxCRxWZujYKNj/Sp3iB/5DP9bkrQwXh9xvalX0VHiyJpXHRymQ07q4DpfjtQx kwZWb3LW3eXUZ9YTLNFpz6QplwCYwkbQpKDZRqhR X-Received: by 2002:a17:902:fc86:b0:227:ac2a:2472 with SMTP id d9443c01a7336-22e1ea7c667mr47948295ad.28.1746336592452; Sat, 03 May 2025 22:29:52 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-740590207e3sm4400511b3a.94.2025.05.03.22.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 22:29:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, anjo@rev.ng, kvm@vger.kernel.org, richard.henderson@linaro.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , alex.bennee@linaro.org, Pierrick Bouvier Subject: [PATCH v4 37/40] target/arm/machine: remove TARGET_AARCH64 from migration state Date: Sat, 3 May 2025 22:29:11 -0700 Message-ID: <20250504052914.3525365-38-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250504052914.3525365-1-pierrick.bouvier@linaro.org> References: <20250504052914.3525365-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This exposes two new subsections for arm: vmstate_sve and vmstate_za. Those sections have a ".needed" callback, which already allow to skip them when not needed. vmstate_sve .needed is checking cpu_isar_feature(aa64_sve, cpu). vmstate_za .needed is checking ZA flag in cpu->env.svcr. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/machine.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index f7956898fa1..868246a98c0 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -241,7 +241,6 @@ static const VMStateDescription vmstate_iwmmxt = { } }; -#ifdef TARGET_AARCH64 /* The expression ARM_MAX_VQ - 2 is 0 for pure AArch32 build, * and ARMPredicateReg is actively empty. This triggers errors * in the expansion of the VMSTATE macros. @@ -321,7 +320,6 @@ static const VMStateDescription vmstate_za = { VMSTATE_END_OF_LIST() } }; -#endif /* AARCH64 */ static bool serror_needed(void *opaque) { @@ -1102,10 +1100,8 @@ const VMStateDescription vmstate_arm_cpu = { &vmstate_pmsav7, &vmstate_pmsav8, &vmstate_m_security, -#ifdef TARGET_AARCH64 &vmstate_sve, &vmstate_za, -#endif &vmstate_serror, &vmstate_irq_line_state, &vmstate_wfxt_timer,