From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338925; cv=none; d=zohomail.com; s=zohoarc; b=U/hkaq2zbZm8WJeQMgEBpIZD8GHmcxRZwLEoaWbrMl9eGUHiNUYba4JeaImmHAbHtCltFbSROuIm92s+3OQz508dlDpnN/oHZebcP4dyHIoT4K4ZE/RdO1tmf6kl4kxt6hMED/4iXvC9omNxXRY9hTCGhyX3h6mIDVitqtQUvBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338925; h=Content-Type: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=2Ev+863iqOIDDV0R/dWNRsZfcIc6LEpbTT/XvBynDLs=; b=f6oGz4cELB8Z1za+IZuhS7UECRlY94qCmYvB1JSHOjI16iw9bx9qjTiJWqflgIGCS8HUuC3irepxzdfB5fPB5AOYwt9tzvXI9V/2/mCMUwFlBTxfdu3/tFtbR7tO5knpm9wNHoxWmzFCLbYqsLTlLVXUnaKscqDiHizBr+WIjaY= 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 1750338925078117.14860387328247; Thu, 19 Jun 2025 06:15:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5C-0003WR-0D; Thu, 19 Jun 2025 09:13:34 -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 1uSF5A-0003W0-4k for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:32 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF58-0003qk-Hl for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:31 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-451d3f72391so7801675e9.3 for ; Thu, 19 Jun 2025 06:13:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a5896356eesm7143238f8f.49.2025.06.19.06.13.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338809; x=1750943609; 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=2Ev+863iqOIDDV0R/dWNRsZfcIc6LEpbTT/XvBynDLs=; b=lGpn58AqjflM/mSD8chw41Y3tco2iQ8oVATA+os40i0D0bG6ltiO4zCErSYqepii/d hn/UL0Mvz+WiUuI9W3YyeVw0mnz1WzkOR60F10d3ZO8m/pUq1AG0IgSS4gfxt/DpbPp0 EdHdtx0l+U6N74LakmdWN9w80cB3eQIms6XbJZfGx6+9ABuhIFtUwMDi2AbH9BCfle2k n/RumQcdnobkgJrTTjKSa2AxkQ+7DPht10p/2zgFagrfou6n0wDHHDbhQGuEcdz3MVU8 atmVgb17qQXHdnhK1u3XrS7/w29wU1CNvwFgbeK9MY9ZPaPbW57ddElREX8Y6hi3QD/U Ebtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338809; x=1750943609; 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=2Ev+863iqOIDDV0R/dWNRsZfcIc6LEpbTT/XvBynDLs=; b=MvMHfHVRcG0l5rd68OZQEpUfW7dOCxFXPhzzTdTeLtii7O601VVs49rzQlVhVI62hH JRimoWUsFdtQUMDAaMoOF0WQabrpOibpzPTarhXv5bljSrwTcjT3ToDqQMUxJ5jV74ZW /VFU+o7DX+IGN9m9n7Ttk/O+oVQJRIg80bfehSDgiDs8nuJMe9O0+B+3Y0J819fCNptq anoUvgOETCj9Jj8r6187z8UtOTC/2TdI2gKnPY1pWbnoDI/LRVgPiEKylCJGPfn5N3UZ 3Z9MC+1noutNjOijWMDriYO+j69c4XI0E7l5ho/Du/HPnZqz+dPt062RH92+75bfGcmi 5JOg== X-Gm-Message-State: AOJu0YzQkq5wDhSfgTgOjnK3V0OXedA27r5NRmHc0eKvPaPWwXBZeHfK NvuiwdW+/SREkdqkLzvQsuqIsB4CAKPST+mcKUuQ3OEDgH2cTjV8LaRmRN5ZkpEM1GgfBWuPOrc 9kYmekdA= X-Gm-Gg: ASbGncsLnzGlUtKwaBKmE3yEeuPAy/8aBwgnWGvDPG+EGWHK3Rpet/wSEgFB3GEzBAM 8v+SS7JA4WOzK4HW8Ng1KU3AQbnE8RanjTWrTYsbHO6eGJgIBlcmdWN96CxHGnZ2pikG5QppBx7 aFrldoZQsFsjkZawC3WBL3iyPHUfA4Dy/tbe1+RrqzxP4+ZZAvEs0/MP5gb4KsdNqx9zgFRtAqX pp8v2n2i1C91rQSD2sdMjYWUhX3pe304Ew0MQeKRuMeopAlOr1YD8D4iBsVNdWgErs/K5zp156A JAuC9hcf6w2eVRo7WVr3ZokxTH+rgOBXVQ0BUAFGtWkgQ8iwbBpzrSEzHH5EXEsLhyb3ecbuRxE 3wNxUrVTCaXx6hzb537kLfPbAD1Rcys9Wftr2yghWnixAiZU= X-Google-Smtp-Source: AGHT+IFkouH7GB8jjz46Cjjpk91VPjUcSA7l4wGoEJYpu2Gq89Z3Iw8lW1b02HE7V1gEJ16AcP6NmQ== X-Received: by 2002:a05:6000:4284:b0:3a4:eb7a:2cda with SMTP id ffacd0b85a97d-3a5723a2c2fmr15063840f8f.30.1750338808615; Thu, 19 Jun 2025 06:13:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 01/20] target/arm: Remove arm_handle_psci_call() stub Date: Thu, 19 Jun 2025 15:13:00 +0200 Message-ID: <20250619131319.47301-2-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750338926554116600 Since commit 0c1aaa66c24 ("target/arm: wrap psci call with tcg_enabled") the arm_handle_psci_call() call is elided when TCG is disabled. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/internals.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 3360de9150f..5ed25d33208 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -650,16 +650,12 @@ static inline bool arm_is_psci_call(ARMCPU *cpu, int = excp_type) { return false; } -static inline void arm_handle_psci_call(ARMCPU *cpu) -{ - g_assert_not_reached(); -} #else /* Return true if the r0/x0 value indicates that this SMC/HVC is a PSCI ca= ll. */ bool arm_is_psci_call(ARMCPU *cpu, int excp_type); +#endif /* Actually handle a PSCI call */ void arm_handle_psci_call(ARMCPU *cpu); -#endif =20 /** * arm_clear_exclusive: clear the exclusive monitor --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339101; cv=none; d=zohomail.com; s=zohoarc; b=OW51iq0VfCqWDjPrXRPjOFkqjGa8O4iekyurINWGlWHbdzyQrZRL8XiY2cD0Qj9uY6fRiPIyfFUSc7dvVWLS78gF29NNRaccGezMR/PAvrYcAtF/2NuMr+aK7Pyr9bHRdaIies1KxmF61XvQUNTdoPh3nHKDSJDmCCa5Pk2yu3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339101; h=Content-Type: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=njVumrb22osQKhmYAguxSrlkLoqT+wPkHlSnrsTIoAI=; b=GEt5Jrm0tXt5rOFAemLWLytI3WmCwi/wmu+lPdqWOyMKAZ4dlX7V3rG84Z+jwtFMLezk2mXEZk6vkhI7/HyIIgGvRPGS38b+HkHylHuGIJhP0t3vi7VoOWgL15JU2tmYkOUnFSMpFGAfb/Eb2KMo15EZRHFjUQaPEmXOyo4B+8w= 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 1750339101890522.517289950325; Thu, 19 Jun 2025 06:18:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5H-0003Y3-83; Thu, 19 Jun 2025 09:13: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 1uSF5F-0003X6-5Z for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:37 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5D-0003ra-J2 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:36 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-45348bff79fso9528465e9.2 for ; Thu, 19 Jun 2025 06:13:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4536366326fsm2312615e9.38.2025.06.19.06.13.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338814; x=1750943614; 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=njVumrb22osQKhmYAguxSrlkLoqT+wPkHlSnrsTIoAI=; b=MGKrNRTwee0OFOgXSDX30+ZpBuA9OD8xA3Y0+tfhEwXseR5Q55DB2NG8ZFcxfhxct4 qLCLbaWP2Ob4ptLuVkRK9pFGOdAiYYyMTlK4x2FZ7qq4CHW1rsZpGZbjhf7iah/io5zO fjay8FnnKyNio2AkcI58WI7kfoq815qxPb8jydDVAz7+5oCVwdtwdw37m75sgoRIbfA2 GKBfvPWtAZhMvxY+2dd4IrHtL2EZVqBpuod13wcCr1A+ggxZV2LGQFrXFS67suQUWCYf ejx03puWvFTmgEEFSjilB5kzif4DCWqub98PgTx2h/qfwhpUAVSxPrpa7MJNKT5BGUqG BZsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338814; x=1750943614; 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=njVumrb22osQKhmYAguxSrlkLoqT+wPkHlSnrsTIoAI=; b=dGWoqC8f6op8VgExximu2hylZHWuSlO0w7piOu1jT3v79X+7boM2QIzecLZTlkaxji EHweLgfpaf8OLkFunaMFbfAczHluQ4/hccFywIbrXgoqxH9bDfCEUjteGyiLVOEkLnGm snka3Tqdp0qpVa6nRoxTBe8Bab7VYAJpda69pqMgXuP+qPjteyzvQc5KpvMaCXu1+mmU d2W3w7cxjGgF6sKNVGhxUlKhk8jHUxlrJYdTUUZbV5wx6V8B/pcf80FXuvmSmnuVqYEz ghUKM0mdtspRv17GT0F/DAwB7SdRYWWWAQOkaYCPw0deVOBUoYnFoLTDb4F2Axf1/DJD /D3A== X-Gm-Message-State: AOJu0YyTrHs2vjBOUrPB0oG8HagJS5c59WwkZ8EFDBnAkqZHVta5fZcB yi5PMN4Jvuu4nOe00NCEvpQx7eOkBdQOO0TKqJHtCJNQXfPBTruqkbpThsyJ34E3C7WOL7NeQPv XVsl/hyk= X-Gm-Gg: ASbGncvYa9VxA/ypzYmJjLZnribseHW3saw5+mpUliXVAmTxIxQmvgzENtC4wmRaYGn gi/D/QjzP3Wuytp5KCN/DfyfQWk1wpHIMWeeadm/3Mkq1icCp3nHA7KKAdhQ9XoAVoYGrdKz1Xy DXqc5iFL7prLZOYpPNbw1AK7z7GWmxLB1tq+CilwGYnCAGTKYcVbhGgCuxNRO7X/5Joi7Qt26xy ro8vgI7AdTMaInVdi29OkhO63VxGVikPDAZIjCj4ITftrr5LJ+vVyNjLygKsUzyRXHMG4Nv/8Bo LlMAJCM3NTCXU4g4Q8c7ny97zpM53epYiPlT5yNyaNqoWSPeraZanACtXC8Twvl34RG/YYCilQ4 WoAfr4CNSUy4/mX3/ONuznL5AipAc3MCRg7Gk X-Google-Smtp-Source: AGHT+IGHJFjSXSFKOe1Y20YU1PJNu67FjETa65TJxweZU1CKSra6h9mGTRAvKIyXP6ctcKvZdSxHTA== X-Received: by 2002:a05:6000:3112:b0:3a4:e480:b5df with SMTP id ffacd0b85a97d-3a572e79749mr18776507f8f.44.1750338813836; Thu, 19 Jun 2025 06:13:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 02/20] target/arm: Reduce arm_cpu_post_init() declaration scope Date: Thu, 19 Jun 2025 15:13:01 +0200 Message-ID: <20250619131319.47301-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339104996116600 arm_cpu_post_init() is only used within the same file unit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.h | 2 -- target/arm/cpu.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 302c24e2324..c31f69912b8 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1150,8 +1150,6 @@ void arm_gt_sel2vtimer_cb(void *opaque); unsigned int gt_cntfrq_period_ns(ARMCPU *cpu); void gt_rme_post_el_change(ARMCPU *cpu, void *opaque); =20 -void arm_cpu_post_init(Object *obj); - #define ARM_AFF0_SHIFT 0 #define ARM_AFF0_MASK (0xFFULL << ARM_AFF0_SHIFT) #define ARM_AFF1_SHIFT 8 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e025e241eda..eb0639de719 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1713,7 +1713,7 @@ static void arm_cpu_propagate_feature_implications(AR= MCPU *cpu) } } =20 -void arm_cpu_post_init(Object *obj) +static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); =20 --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338875; cv=none; d=zohomail.com; s=zohoarc; b=AB/5323iM8Xg+mE9SUjfDocWSFGX75LUePCmw28WSULw3Y/S+HO9fjr4O7Wbz5Dpu5BuBVl0P3C9bzULUfziV61F1JfEz5/MBh8LcZsTOd50sdl9LHknUM662xM1qg+7UJIPTldByTCtSjJRZANWnSsEJVmw3bjhGAgGFm5mrj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338875; h=Content-Type: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=m13ygoLDvh6s/fst+7Tr47HarqNeCSRYva1lK7z13IU=; b=jm/DpcwGrsA1rCub1W2Ez7A4DWlSEw4TOye00AwUSpMV35tslTij5Hx67vN0JH2xOpy+nQL7vPP3cws1Jix/lf7e8luJ2Df/lvsGZvDyTYk2CWb8iRPQKCdeNEkvaPt2TezudYGaJzYnBbvc5JyXuXSkgXtEu56Eq1npG3VlmMY= 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 1750338875706221.97989618964107; Thu, 19 Jun 2025 06:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5L-0003Ya-7a; Thu, 19 Jun 2025 09:13: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 1uSF5K-0003YM-7M for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:42 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5I-0003sY-OT for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:41 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-442fda876a6so6669295e9.0 for ; Thu, 19 Jun 2025 06:13:40 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568a63a42sm19432884f8f.28.2025.06.19.06.13.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338819; x=1750943619; 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=m13ygoLDvh6s/fst+7Tr47HarqNeCSRYva1lK7z13IU=; b=nZUvq2ofQw3FbdzHhfpC+uYa9WFyaVRilvpg0i5hLG4BDV+oWsbSfJS0BVMFbumbTx bpC6ooIGqy4gyvz2RBmU0+qbJtCjpKDqKzA+PD3Kj34PprBpsTrl7sWx0M9rv7CnDVTG hmvuYcOnCjuxBSAj15svNhDvCeCD1q4q4R73ZwfF/+hbvHCuAhJjSMHA58bi26Z9Qkvl h8Ky4wjcBPYokgnPgslzNi013/GaPjXtuGx9hETg2NNbR/4OxU49AzwkKrWWsKmA7+TT 0zfYS8SWOgMdsQLQIVft8gcfuMEHOxviThvcjpAy86G6fkPiWT4xzYihhmF2qkKI2J2C +/uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338819; x=1750943619; 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=m13ygoLDvh6s/fst+7Tr47HarqNeCSRYva1lK7z13IU=; b=Z7iY3tDXdwHX488nzlShTds7HbkoelR8+QUP/J2K2jX0ed5A6DLBvCBZBk8x5ag/sH mPVKbFDvj1V2RjeVuaE7WY8WOlLRf9JTf98w5LU4uIKdU6tVmKxPPA+DN3Vgq/Ebvsk6 MEUxP8tKtrzmyZ9iPy6AoAGCDWa41Tcu467y6G11tvWNoWfC3gWKE0zfFnBe/Dh9jazA SqUdCRgqUiIPbDKBFxLVGJOvpVWyEbtao88jfpMjBUHZzTo1HZQudL8ETQzR8yabp6OE DpLpsTIMOMoWJWqNKEm9tGhF4Mzmde0m3VhCg3J2De6fCWzqlZrJMyvJ9u6BmLpqr1PO Rcig== X-Gm-Message-State: AOJu0YyoS7Q/SK5FMRExCBMkxv/PNg3tn03pu0PwwcEHSCgYaJWma6K/ 8Vmo86VrcARDBbwELPmw4RmJcnrF40C6f0YHYqyToNP0osnRk5oDoOtbDuOQMO7E1oGB7AnBQuB ltEtLb/s= X-Gm-Gg: ASbGncsvqCDaK2DW3gQvSPg+GmMs8FH+YzmfChmG+kMHS/TQzvUQDVc+zfGz9G9nMMm 3VdzqogDtgSbQauX2rSaDNhWeA2n328qCJUG1PePLnARVHmziUj10tsusFVwWtXXNgp7ZXZBNe/ MUeX8zUV/mFdMZK/4zQpasftgck5kOINjxu0peX7jjJnhnrqRRQ6yrFRP/fU1Tbb35/be3xMqI7 CrwFRR5M7wH1WAwmFtDu4tTAPMvL2u3EQU/ys0OqJ2C+30Ebcr163bBT8hixZj9lsm9x1UMC+Bw N+bsmSjHGhFxSQB54qsRkgbOP5JPzOg2/idxJKC3KPE3XUKonnfceurvGNvgioACbRxg0giMnbP C0hYFRC5XBi/v/p9+XX0hmVq4zJfi4p/w/mrI X-Google-Smtp-Source: AGHT+IEO8Kjb4Mvn+BDG+XfJmXx2Yihaw89GQo0uaRCmp6Vgs4sSa39n5dXH1LqYB+JVnKA8de7+Fw== X-Received: by 2002:a05:600c:c16a:b0:450:cea0:1781 with SMTP id 5b1f17b1804b1-4533caad471mr208337255e9.16.1750338818974; Thu, 19 Jun 2025 06:13:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 03/20] target/arm: Unify gen_exception_internal() Date: Thu, 19 Jun 2025 15:13:02 +0200 Message-ID: <20250619131319.47301-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750338877153116600 Same code, use the generic variant. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/tcg/translate.h | 1 + target/arm/tcg/translate-a64.c | 6 ------ target/arm/tcg/translate.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 1bfdb0fb9bb..0004a97219b 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -347,6 +347,7 @@ void arm_jump_cc(DisasCompare *cmp, TCGLabel *label); void arm_gen_test_cc(int cc, TCGLabel *label); MemOp pow2_align(unsigned i); void unallocated_encoding(DisasContext *s); +void gen_exception_internal(int excp); void gen_exception_insn_el(DisasContext *s, target_long pc_diff, int excp, uint32_t syn, uint32_t target_el); void gen_exception_insn(DisasContext *s, target_long pc_diff, diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index ac80f572a2d..7c79b8c4401 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -433,12 +433,6 @@ static void gen_rebuild_hflags(DisasContext *s) gen_helper_rebuild_hflags_a64(tcg_env, tcg_constant_i32(s->current_el)= ); } =20 -static void gen_exception_internal(int excp) -{ - assert(excp_is_internal(excp)); - gen_helper_exception_internal(tcg_env, tcg_constant_i32(excp)); -} - static void gen_exception_internal_insn(DisasContext *s, int excp) { gen_a64_update_pc(s, 0); diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 9962f43b1d0..f7d6d8ce196 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -372,7 +372,7 @@ static void gen_rebuild_hflags(DisasContext *s, bool ne= w_el) } } =20 -static void gen_exception_internal(int excp) +void gen_exception_internal(int excp) { assert(excp_is_internal(excp)); gen_helper_exception_internal(tcg_env, tcg_constant_i32(excp)); --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338911; cv=none; d=zohomail.com; s=zohoarc; b=U3J3jhbUTkcUDymG1sC1fYDFGpQbli3GcHkBLKUOs9S5hTvWfuZ48cw4HOWWDrRmM8Ja7pRC42dgsps/RnkVVSFDd8oQxasWbxMliDzbj2PZIZZqZ3mWOj59tZNYz9J2JFt0q1DoXv1Qv47bBlc6T3j4SdRb+8h3xO+T6R+wnw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338911; h=Content-Type: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=8AfBQUbCa0g6ZkI9T2sAPEVDRyQTsrNETxFPLqSkQ4k=; b=Rr/PHLRv4F7on7E5D9emYpCrfiubl3iSWxR8z4pIsT1p5mSyQGKLwWNmnkqwH7hqLATTpQQUckLriY1e2PVW62D/FXFIlp3HmAf3JALnzXZmd4cVYHmRZJV+43SmmMI53TqO3Z5gFs+MAddpIRegJwdKvW7+v+25hTPvoXh+5QI= 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 1750338911833270.4244148112724; Thu, 19 Jun 2025 06:15:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5S-0003aG-8y; Thu, 19 Jun 2025 09:13:50 -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 1uSF5Q-0003Zf-Bi for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:48 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5O-0003tl-89 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:47 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a4fb9c2436so428856f8f.1 for ; Thu, 19 Jun 2025 06:13:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebcecdcsm27991485e9.36.2025.06.19.06.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338824; x=1750943624; 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=8AfBQUbCa0g6ZkI9T2sAPEVDRyQTsrNETxFPLqSkQ4k=; b=aUFnQWYGuwAwCsmzOqw0GzUJcVdyn6L8msk+0fc8n054K+P3Uj31BPotwmH5FBuH6H ZZsXk2WzK8Vgeezl15kCszBmK7aEX5hPuCKR+7oAHhGuLU3FgePVlWyqBGzS4ZvfyYSS zzEVJqglZwAikduQORdfDGdMMSylAvRtsj7bAXPnfwYfPD00hBzR1LrDm90iNowIf/5x GO7XGsDrExymwfvxxyeYXyuBsrElrW+NToW4mw3UxcMch+YRg+MeLdgMkOso84mApg5a YXvppnaB+j0HMV9E5UNP4/sVeWmBhMvAZA1CGV2sJB0T9lhFx1I4mQqzsK6QHdnx2w/2 VjNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338824; x=1750943624; 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=8AfBQUbCa0g6ZkI9T2sAPEVDRyQTsrNETxFPLqSkQ4k=; b=ZVj08YB17w0+O37YR2E4E1zIT9VR9jRZmti+GnZ4wj+7ZZn579F8zyYn7gqFmjwV/D mguH+fQz7vJ6dCr6TiFPseNSfFqzPDsEAimyxzy0kW9H2t3wsqZtd2H6kogd8EWJXYe4 66s/EYwYc4N3vWAdfuwB6jAioNtgwHwr5IL6BLLs35snNJxMr+wlFBil1x0u/JFOBNPo nquZYXzlTW2Dbp4XmvHYfBltUDDf+WkzRt+oR9HYcbXeLhqPhS86EkUFu5ybFrXKqgcb XI6D8YmKK0hdRNZ3pSLegI6qPEzHerX7X7Hv5dDLfPDPTt6kgqhC6pO/kMliAyBkeCqX 0YFA== X-Gm-Message-State: AOJu0YysYF4+ix9hKkmazw6HNXjVi6JQH5Ed9q9XGRtWA4nqu32miGXW sTQ/OIMPKvGLfspYrOUjCcdtKUFRVR895gJYUFrTEhRhLytYFyc6opy9CvRLGWS0YbPILAyG1mS qQ8FTjho= X-Gm-Gg: ASbGncthIffRhKYRX8wQbluPLSak/1Igr8z4+3ayvygufU1EuWqhlSZUPoI0REwB5Tv g7B1XIZ99VS54SgYuCxhk8Vw+BFA+2urrh8sVGVolO0gHdw4m496lbe9x5x4iNQTHppZrSe4nmv ykvx3loJjEjZR9ndhP9QRb3IAewVnDk0F95Nv7Sa0D9K5SRucLvnHBDTNA1lxGsAyVhuGtMCxpJ zjcIPJRdV26TYH25zIxUwyiZBCtkWxYD4TKrDjYwWV0vo8WwbLKgAR619uMnoheXG/yZuVr6IT8 DfmOzTepOHgSLg/E9w/TZ/NvsYXnK3gW4BXA5IxJCDsp6fTVRSHn26236S5fWOBUxJs0y2y2GNo PsPWaz70abCTInxWJ5E1Pz3nCuyOhlErCXX5g X-Google-Smtp-Source: AGHT+IF5e/MuVYJRmblkXpvIfqjyXNK9gk5KRckaMD59FVUxTzSpN5L9R5TIl76Grn5AxAQzY7bE9w== X-Received: by 2002:a05:6000:2c0f:b0:3a5:1c71:432a with SMTP id ffacd0b85a97d-3a5723a1889mr19428150f8f.14.1750338824180; Thu, 19 Jun 2025 06:13:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 04/20] target/arm/hvf: Simplify GIC hvf_arch_init_vcpu() Date: Thu, 19 Jun 2025 15:13:03 +0200 Message-ID: <20250619131319.47301-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750338913053116600 Only update the ID_AA64PFR0_EL1 register when a GIC is provided. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 42258cc2d88..06cfb7ba253 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1057,11 +1057,13 @@ int hvf_arch_init_vcpu(CPUState *cpu) arm_cpu->mp_affinity); assert_hvf_ok(ret); =20 - ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1= , &pfr); - assert_hvf_ok(ret); - pfr |=3D env->gicv3state ? (1 << 24) : 0; - ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1= , pfr); - assert_hvf_ok(ret); + if (env->gicv3state) { + ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0= _EL1, &pfr); + assert_hvf_ok(ret); + pfr =3D FIELD_DP64(pfr, ID_AA64PFR0, GIC, 1); + ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0= _EL1, pfr); + assert_hvf_ok(ret); + } =20 /* We're limited to underlying hardware caps, override internal versio= ns */ ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64MMFR0_EL= 1, --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338875; cv=none; d=zohomail.com; s=zohoarc; b=OZfJxLcnUsyR97j6E2Vv2GPT38uf/MQabCWFyc1JoWxuFqcFLX54kpU3Utx8WPGjppmFDp0/XIyg1GtKkR/7AXdtJCpKdwS05A67A+zc6Hpn/G7taQTjBAmpI94WB2Rcpy/AsPB5VcNbRa/TuiE3RypHjzccdJO9udm2EnqgfCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338875; h=Content-Type: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=koI7CnNYm2D9lEvcJSA5oXP0UBqqfZr7o8MD1iUlpkk=; b=enf6pSg8cU7BaB9GH6exrKXA54JebwSxm5LR3GTLnRetnIfY9z7cOkCEbW4INX0HUtXYfdZtoyyRJIftwlI9So6Hl1dpstERy8s5YC0cevJD8cqa+jTI7NVa2lB5PJ6zjZRYnaBcV1cEC0AJAXtrHKXSEqJvKHXh4JG3FI/yhvM= 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 1750338875869108.61227685802942; Thu, 19 Jun 2025 06:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5X-0003bI-UP; Thu, 19 Jun 2025 09:13:55 -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 1uSF5W-0003az-KY for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5T-0003uA-T5 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:54 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a57ae5cb17so498959f8f.0 for ; Thu, 19 Jun 2025 06:13:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568a54d98sm19334475f8f.7.2025.06.19.06.13.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338829; x=1750943629; 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=koI7CnNYm2D9lEvcJSA5oXP0UBqqfZr7o8MD1iUlpkk=; b=rpY9D9/NtOxnELq5OePeWR1SWivWzLLPOzApNF/yiveONjyt/r2L8tV0PP1BwWGUXQ LGUrxCnPkGbyNRU+TYVCR1Cezcy1IG6XwHJVJJQI9hqPOKV4duidzi45qXG9MHde8yon JvxReAI92DYeJ7FdZ7Chk5actS8M1BUtHXmcobQ/MiDwRyMixHodSWpK5tdwDBFa8e2O gaVJw21le13BJdbNBSmzUWEovNeKybC82GzibF3NABSxmOGz0Zdj3o2uiWfyvElhGPvO 5oHaZbWmpIwJRR6zl1xKL+nhlMMkbd4bHRr/8MEeQrWb8SHrYvgVSXlTvA6KbHU3vpev qtKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338829; x=1750943629; 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=koI7CnNYm2D9lEvcJSA5oXP0UBqqfZr7o8MD1iUlpkk=; b=vDHZ++nReo3bdD9o5NfvPYYqNkDATSAZFo5QzTyllQs3VQlEs/f9PE4jVGdGlzoo6x 0SD3XvdEowTV9gY3uxhEt/MG6aDvC4+aAb9+wFrHZkIjSaInsyyirSdMhUn898U593CC XGoCSig3I+HPKImWgddODvDhDOp6RJVvaxAk793hhJb0vCl5xLG67qoEBwSZZNkLscbQ XQZd6LbBbhD5i2FGLEXih94thrA2yGrNJXAwDAJWp4ZTSc4Yoy6Fv2o70nVkmhi9aIDR a6ReOpfQNZg0V8TTsh20EhDRBuNw3ZQUjUbebZi1A8iEk9lxf36JKMl1l2lPAefJ6IM4 xB1A== X-Gm-Message-State: AOJu0YxjR89W3rKYlmPYab2rVLIqhZsmePPKfp/BxmPb8MbMrIAqDElH PcriccOs7fjoEO04eIUiLGey0Kb28CdOtxLq1Nb3hdnDhGr4GOTjZnSTgIuvZPUif440lono2z5 IxCmEGwI= X-Gm-Gg: ASbGncuG8SCnr5qduZUnMJqcDYTLUhma+7vpq/mApLsiIgCW1T6SsZsk7JnGi9C6ZNG MZgN6zukDlBdBpP9ZUZu+/GrzDo5yv8PcDtY10qAZLPsmra2KYD3G26LgqLhpN69e3i19mT7B0Y UULRO634I3p97mVpUN7DtPQflPsIwpossNdvHBHbrfAUeZTpaG4mp0YCo2ixT5HPBHm0vXFZaXt hUUNzAX6oP86/EBNeYL7XO7tsQkIRmM+Ck58VB7vUzNq3huSzuNJcZ1tJ9cxLEU31KfwxMkmdaJ KcHHc6+5qvybyuWF27nRUE/vmxpTCLPQGYldxv4bIDN2udiAmgZgmTVDaaacpDkwjVj8iPFHL9w E7WQEQkvhgcGMjRUfY+Lq03DSSkDp3S/JrqqL X-Google-Smtp-Source: AGHT+IHJrzY26z4C7tz2r1whofL/rZErrzZAlc3mqjpoocixPuSsJt3B+u9kOmz8CAv44XQRwKEYAw== X-Received: by 2002:a05:6000:4b03:b0:3a4:eac6:e320 with SMTP id ffacd0b85a97d-3a5723993bfmr17703990f8f.3.1750338829465; Thu, 19 Jun 2025 06:13:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 05/20] target/arm/hvf: Directly re-lock BQL after hv_vcpu_run() Date: Thu, 19 Jun 2025 15:13:04 +0200 Message-ID: <20250619131319.47301-6-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750338877156116600 Keep bql_unlock() / bql_lock() close. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 06cfb7ba253..30dfd97bebf 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1912,7 +1912,9 @@ int hvf_vcpu_exec(CPUState *cpu) flush_cpu_state(cpu); =20 bql_unlock(); - assert_hvf_ok(hv_vcpu_run(cpu->accel->fd)); + r =3D hv_vcpu_run(cpu->accel->fd); + bql_lock(); + assert_hvf_ok(r); =20 /* handle VMEXIT */ uint64_t exit_reason =3D hvf_exit->reason; @@ -1920,7 +1922,6 @@ int hvf_vcpu_exec(CPUState *cpu) uint32_t ec =3D syn_get_ec(syndrome); =20 ret =3D 0; - bql_lock(); switch (exit_reason) { case HV_EXIT_REASON_EXCEPTION: /* This is the main one, handle below. */ --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338875; cv=none; d=zohomail.com; s=zohoarc; b=GnRC2vevMsxHKR8tcJUAXJ/a/EjMBkmw2ADevFNPAmU8EKqgJho9cUIbYYvOGJ9JCtpqKhuSauMdPyDx0uNN3kQA7iVGeL8apSFGghYm36Htj7CXvmkRgoGSJSSxjQSDdhvUEOTVC6wMT++SHcLhMhoURzeXRcIx32FfZroMfAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338875; h=Content-Type: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=UyPjw/EICSj11C7UIftsbx9d+1RqLVuFlx6cdDbkp90=; b=jYCVB2qbfXHzFBcsMFd51fxOj3jO0u0hFOCc0BHwXvL0qrbLGk8JUin5lilIuboggBE6mEY2YbiFOH/58x1otNV/JFSbkDbKYWZS3hjWEASTufky6pztTnOB7hFo4Ezs/seMarxnGFY+1kuwgK0fuz+q1Zf2j7aRJcNwN03i95U= 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 1750338875757817.959560703014; Thu, 19 Jun 2025 06:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5k-0003eZ-91; Thu, 19 Jun 2025 09:14:10 -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 1uSF5a-0003bm-9v for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:58 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5Y-0003us-J8 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:13:58 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-453426170b6so11657685e9.1 for ; Thu, 19 Jun 2025 06:13:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b08c7csm19792341f8f.50.2025.06.19.06.13.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338835; x=1750943635; 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=UyPjw/EICSj11C7UIftsbx9d+1RqLVuFlx6cdDbkp90=; b=gr6+GD5+OH3NlGnZnhU47urC5+DZB3m5ANhI7H5Ie6P1oBz64tpfPjizGD56sO49wb V08g53PAVJUduO29g3NmvLYwzlSOUq4aKph9ByjYn1lBcMWk2Am3RynaVVCFgCcXVhX6 bWKYl7K3hBINvku/pSvgiWOuKS9Z3FhmeVlOmwp2y/ZwNS+TD6WGdKxT74ZZEXX/3Pn1 3j7gP5ZhrvssGtW5QCa0SbXG7gD1oFx3SeFYoHVckl12olUSBVvAtApvXwwVfDYL176Z PUtvPLeJh0L6MttbAdD+pizk78iXNXrstKW/Cb/rPkdWWZW9MzDSOyT+PwjvmSyJJNfc /B+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338835; x=1750943635; 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=UyPjw/EICSj11C7UIftsbx9d+1RqLVuFlx6cdDbkp90=; b=OElqdxpnMvQQoopYs3+V1rUfUJBdLzvfUZgoSwDKt+wAO4yHaFjd3R0cypAw8qISUm 2Dvb7Kx8PcYsVfHlxt1mbL93ib/OMdN/bcDF6FxI4JU9nCauzUQUHWCHJ/84E0iS7Bk6 LtFhXh40q+JqlndrKz8dMHgNSc+RHrfljXUSqWtzKGgDIHUaXZG0t70cj2tlJKkMrMLn fFjPGIQzzUoW8hLxVrUDOVRA/cYx2oyyx5Xsl8COfCFcQWySsduUKjb3b1yB5bMQtxFC O+U8S6gBx3fEggtIo9QcM1WQwOnv5U8C/n9ueX7U8zoXaQKZVCLzvvXe54t47RAAedAK zp5g== X-Gm-Message-State: AOJu0Yxz3ng2H40ssaQHP3svFkiiFPn9JUbWVflnnwaX6eBX1DBmhto8 gphi2EIJrNXehWVEjL2vicNr42CIQLDVwor2ENYO0wpMPErJKyTkClbAnhgriuR6qisx6uME+YB 6yX2YCVw= X-Gm-Gg: ASbGncuYxy8i6zti0l18IpxFF9Rmy5SGNv3yjHNOVmRLSZC+9rPtHCTeEJZnoyVIBQk e1cFvShkYchNj//b1+QHbikembxl5otfj4e2JMnvhl+sxpA+hPj1qZlquTtYzo1VtT0BaGVY62z 9tpKMynyJXDYhO5ENeKcY5Ptu84BhgZPKwt0sfqyERDXa9KGz9zbw2qT9oNv0WoD/lUu0tle4MC hyz0CjrkUEywu4ukDUQCbEs0LvoHk70sTd8hdrXqUGDM5pehpx1NoMtwVt0LiJmDCL8mqUDJmr+ DDQHc1lqggh02rpxZlvur8bx8sIM2q7h4TlAtUvhRysFcvI8hivlGwcE0Y5mfhetLetk+JarSCy Jhrw67N4WcdJkOoBmezlwNg6i7LOyJYHm6IUq X-Google-Smtp-Source: AGHT+IEjodew1p2iOcXaxxRKozUpoGn7RLSDtMkNBt9kEo1h6AALkAFYm4aB/mN1Eoyo1pNh3qgXcA== X-Received: by 2002:a05:6000:2210:b0:3a5:1241:afde with SMTP id ffacd0b85a97d-3a6c9692af0mr3671381f8f.9.1750338834779; Thu, 19 Jun 2025 06:13:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 06/20] target/arm/hvf: Trace hv_vcpu_run() failures Date: Thu, 19 Jun 2025 15:13:05 +0200 Message-ID: <20250619131319.47301-7-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750338877045116600 Allow distinguishing HV_ILLEGAL_GUEST_STATE in trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 10 +++++++++- target/arm/hvf/trace-events | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 30dfd97bebf..1ff3ff7b91a 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1914,7 +1914,15 @@ int hvf_vcpu_exec(CPUState *cpu) bql_unlock(); r =3D hv_vcpu_run(cpu->accel->fd); bql_lock(); - assert_hvf_ok(r); + switch (r) { + case HV_SUCCESS: + break; + case HV_ILLEGAL_GUEST_STATE: + trace_hvf_illegal_guest_state(); + /* fall through */ + default: + g_assert_not_reached(); + } =20 /* handle VMEXIT */ uint64_t exit_reason =3D hvf_exit->reason; diff --git a/target/arm/hvf/trace-events b/target/arm/hvf/trace-events index 4fbbe4b45ec..a4870e0a5c4 100644 --- a/target/arm/hvf/trace-events +++ b/target/arm/hvf/trace-events @@ -11,3 +11,4 @@ hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "ex= it: 0x%"PRIx64" [ec=3D0x% hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpu=3D0x%x" hvf_vgic_write(const char *name, uint64_t val) "vgic write to %s [val=3D0x= %016"PRIx64"]" hvf_vgic_read(const char *name, uint64_t val) "vgic read from %s [val=3D0x= %016"PRIx64"]" +hvf_illegal_guest_state(void) "HV_ILLEGAL_GUEST_STATE" --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339226; cv=none; d=zohomail.com; s=zohoarc; b=FaRG5FrJcMGE4VI/TTRSoosJD4ZNpif4bjryYq2B8WC4ZbMMUTpec5vFECkLdhjuaBACuDI8x4c02fv8useQ3Il61MCd81C5LQacnQGl+qI8v4PuWsVYwRhF57i4LiHd6hzJXvMcnf5DuNW5AUAcgo9BkfNXZ0erurNL+ut9kgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339226; h=Content-Type: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=zHGHBjHnm08XY2FWC1TeHuwJJyw8Eo3SwtB3aTyB57o=; b=OJRenHdzPvSY60qwA9+E84wXgtiFlC3yOC4BGw6g9KRFgpQPVbaymur2rBDpe/UGtX3vhNnen8wZ0SkiJqynK15R0V5S3rUYkQGaMVTxJ08UN2zOvA1HxxiLmlW4Q4AeB8jX3ArpltGPKBOAegWlZRVi5pCzlYXVQouv8T0gOHw= 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 1750339226620812.6907845020124; Thu, 19 Jun 2025 06:20:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5v-0003iJ-BF; Thu, 19 Jun 2025 09:14:19 -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 1uSF5k-0003fB-Hq for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:10 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5e-0003vY-LG for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:07 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so5830605e9.1 for ; Thu, 19 Jun 2025 06:14:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568a547ecsm19782672f8f.17.2025.06.19.06.13.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338840; x=1750943640; 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=zHGHBjHnm08XY2FWC1TeHuwJJyw8Eo3SwtB3aTyB57o=; b=D7haTk6W1wzVr76xrdfjuJP9FVlduEb0cjJYSlkGMbsM59S1DsXIW9BT/cbab35JgZ r4C1RwNDzO9SFr4Sn+Sjguh5CBCNIpxH1AJJXHNH2WkvPYjRIfHYy+S5hiB9zO3FaTWu NxyLjWlsAj1flYOVsCQstGluWTa9CUoPavrGbE3X9LUfkTABvWVvWbwGZgkyJq1PPJEM W7gHiYip01GyuNBd6SWI4o5VfQEUssZyy9ZGEbRphpLEI5svNZjSnO9onhfoPCGIiMas VcCNgehwRz63VHQzF5H5kvPuPMKeg2VN4TRsppud4L4ZhBN6s8iek48NoFUEpb9EShAc evCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338840; x=1750943640; 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=zHGHBjHnm08XY2FWC1TeHuwJJyw8Eo3SwtB3aTyB57o=; b=dUAGmdLy6T8RJE1F7RyVZUpmDIMxEENtNPOYs0ZCH+Z23PIRqe4mjKq1SY8v4Araqf hliCEyAz5Be4JlSUeTGBV24OK8P5yBNxo+EBus9+e+b9ePsOziPbgE+m8WiLuIjQnnDq EsQTwMrGHAz9K3SvDUx8iiMxL6jkQ5PW6yRCbovl9Mn7ycYJ6gShzUXxyI7+jNjAyeNL 94nmISt4G+lOeAIykM+UZd3UHUQeCCeFbLg4OzcYcgzte1zaGfPfL14xxSmEy5D0wf1o zafpbW9OADOoSeXZtfqh4iaCJ999zYnafkfVrXx+7ZEZrqs1ZmP3BK7iX7Nov1OTIgkC 7s8Q== X-Gm-Message-State: AOJu0YxvAcudtmIk81FpkmBej7nHJZdc0O9FX5JZ7duxEHMX9pFrFJ9T 81YIbhpl8ZJQ9MEYOX2RApM2mHyTlhnXY1jA7KN95mYKLPCgWjHi2OaUMXnweUXd47D7g4wqlCx 9FxnEqkw= X-Gm-Gg: ASbGnctBc9ThOhFlew4A0sFMhnz9sfUIyQDXGvXS1BPG/5ki89IkSGRDeLDlI4A/xVV v/SHUe4SvAQo9Png0dFaENszS76/zKiBIR2jOZs3+CGmPFJSl+QTaxf6/xTkl49GZ+CpTZjp2iM nw81Oe8Z3pNKls1sbeDbamo7JQSriDOxKMBP3J/AN3rg0k1WTdZVN87kDOeYLShVUPLTZPPldne +An1pMf1SlY+2i6KRzPacdnRjHaKz1APig7DJEUc3OKki9I6CSpTmo+EXUTno6hhB4SxGMauIFH B/WaSZF4q9aR5U3NDnhBSNpYWuGZSem48qIUbmXWfIsytPu0oZvPES1A1xejn0fMGWdhNGGx/1d rn1SN9VWIa6j+eZnQ/D37hy4Vow1rai7ijmJm X-Google-Smtp-Source: AGHT+IH0dt4iGJr6FYYNqBSMaXpFrU7CwfQvkc2Mt1yc9XX3BrxWP2rVzSQNRIHBHoy4vELO8HZkLA== X-Received: by 2002:a5d:5849:0:b0:3a4:dfc2:2a3e with SMTP id ffacd0b85a97d-3a5723aeb2cmr17281843f8f.39.1750338840330; Thu, 19 Jun 2025 06:14:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 07/20] accel/hvf: Trace VM memory mapping Date: Thu, 19 Jun 2025 15:13:06 +0200 Message-ID: <20250619131319.47301-8-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339228435116600 Trace memory mapped / unmapped in the guest. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 1 + accel/hvf/trace.h | 2 ++ accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/hvf/trace-events | 7 +++++++ 4 files changed, 16 insertions(+) create mode 100644 accel/hvf/trace.h create mode 100644 accel/hvf/trace-events diff --git a/meson.build b/meson.build index 34729c2a3dd..5004678a26b 100644 --- a/meson.build +++ b/meson.build @@ -3633,6 +3633,7 @@ if have_block endif if have_system trace_events_subdirs +=3D [ + 'accel/hvf', 'accel/kvm', 'audio', 'backends', diff --git a/accel/hvf/trace.h b/accel/hvf/trace.h new file mode 100644 index 00000000000..83a1883343a --- /dev/null +++ b/accel/hvf/trace.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "trace/trace-accel_hvf.h" diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d60446b85b8..b38977207d2 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -59,6 +59,7 @@ #include "system/hvf_int.h" #include "system/runstate.h" #include "qemu/guest-random.h" +#include "trace.h" =20 HVFState *hvf_state; =20 @@ -97,6 +98,7 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory_fl= ags_t flags) if (macslot->present) { if (macslot->size !=3D slot->size) { macslot->present =3D 0; + trace_hvf_vm_unmap(macslot->gpa_start, macslot->size); ret =3D hv_vm_unmap(macslot->gpa_start, macslot->size); assert_hvf_ok(ret); } @@ -109,6 +111,10 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory= _flags_t flags) macslot->present =3D 1; macslot->gpa_start =3D slot->start; macslot->size =3D slot->size; + trace_hvf_vm_map(slot->start, slot->size, slot->mem, flags, + flags & HV_MEMORY_READ ? 'R' : '-', + flags & HV_MEMORY_WRITE ? 'W' : '-', + flags & HV_MEMORY_EXEC ? 'E' : '-'); ret =3D hv_vm_map(slot->mem, slot->start, slot->size, flags); assert_hvf_ok(ret); return 0; diff --git a/accel/hvf/trace-events b/accel/hvf/trace-events new file mode 100644 index 00000000000..3c11f69f305 --- /dev/null +++ b/accel/hvf/trace-events @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# See docs/devel/tracing.rst for syntax documentation. + +# hvf-accel-ops.c +hvf_vm_map(uint64_t paddr, uint64_t size, void *vaddr, uint8_t flags, cons= t char r, const char w, const char e) "paddr:0x%016llx size:0x%08llx vaddr:= %p flags:0x%02x/%c%c%c" +hvf_vm_unmap(uint64_t paddr, uint64_t size) "paddr:0x%016llx size:0x%08llx" --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339075; cv=none; d=zohomail.com; s=zohoarc; b=NlgwdszmcFfhlLTKeRzAnk+hxlv6bRfA2LBY4YQXWyFOzwnVq0D5mvNbxQ3we9E+aVqYKhCgcqZL8E9c2j+1cbQLvy1hz41TNHsxIur7fVgoyCLwSG+e75LLFkltHdeu0qhSziTAR+/0iH8LWPuL6aaMShs62qZ1GABsBR3BYnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339075; h=Content-Type: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=V3vxCB8AF1OexrFi26RMBcdit/f0pHUtl0WDW3lo3q4=; b=OSTuymQz1hspDUjsfkKZb4x9fXqArHNzSEiBH6DGpzuniFjllEKGnkEUcNB3gcquorotqnlXqWVeSrySKWnLc4yHDKy4Ahbs6w/pX6YqAAyEDgRPvjJWtIcoCC1iM2tMu0IU4fUnwALkL3NBQ5GXfBGssfmQadkIHcOUIDl8FRA= 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 1750339075918599.5220945780263; Thu, 19 Jun 2025 06:17:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5u-0003hG-IF; Thu, 19 Jun 2025 09:14:18 -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 1uSF5l-0003fH-Ud for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:12 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5k-0003vt-AI for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:09 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-451d3f72391so7806765e9.3 for ; Thu, 19 Jun 2025 06:14:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535e97ac4asm28331335e9.3.2025.06.19.06.14.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338845; x=1750943645; 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=V3vxCB8AF1OexrFi26RMBcdit/f0pHUtl0WDW3lo3q4=; b=DMaUwi8UaqKiHT3XdYHdzvT8l3ni0strEsyePaZgEsgvrAxMas/pfdODI8xHDCyZ1A 08vPfAkk7rcEA9e1S9xkH2NK6l2gxr3/hba0g/jz49O42Su+CNGtve36fqbrUSvSQHg2 tXLEm2jorJUJdhefBexmBNMdpKNXFiqqsTQcHp7m/jZfNwrj0/rM5u018OWn3OuOeH/Q /zrpm72vYnQ+ZWgyPmmr6h/RZOEW1jRD8qHnGOaLFBFuueiMR0nALtfYlMKxK49HfvXR aDZeb6jx+N/8fnFHY/DKq3i45yH1E98bCBlAHEHKSXMVfhUFvZYDPlyTdJba9/rmbIfs hqeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338845; x=1750943645; 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=V3vxCB8AF1OexrFi26RMBcdit/f0pHUtl0WDW3lo3q4=; b=vcLOQ1LKnryc3dvsyk98SoqViH3Be5VKfXOLLWdtUD3+kB7OORHmmL5TQNODZt76M4 UEwyHXxZrBmdZGjP8pdeCAXzHo1O6m2vU49KvV0O8FiYkWWf70b+fj7x+5LsR0kAJX+M dEM3PZ3hanUwKkPbbnjWy+DGgBa0YVfjxXcqyzoeEsNBsKR0mVcQSr9xuqu/abIqVfxf 36Otzsk86swVT1lUWN4nJvn+071BoIvBSwhcwRiDJHN0gbWTGYldFj5WBrggAIDTuqiS bpzxfn742R7qLEovHiYGRwECijwFRDnq+/+1abGD5pLyTeExm8NO+1pe8g6h5JMoRYxu W+Sw== X-Gm-Message-State: AOJu0Yyp6gRE/S+IBNOQlZN1joPBnBBCDVDYq4o2MLSz7nwxwPUEYn1P 98ZydsUJkQLMFD6quODu3KRunCy0C+WFDwvPwXIFmTLx35enjcFOpWG60Oq7wzxe3kmoz8p9MXv V3SGefO8= X-Gm-Gg: ASbGncu5qQw0NI91iWLzGrCQKj8h6JORmySH1NlE6hjcHJHkT76t14H0AaStO9YYFwG MlObkgED7fnh0gcTCbKBm5zjKxF9vjkvrgsgNZEb6nRYCxqYP+FaOGjZ27LEYIsr2dpdLf56GPp Pa0r1MEUsGXUEAhHc8Y6ssyqHq34qDYlM0qzxZFVXa52lzLgrVm/6Ejz0/vCPbmE3PvX7fOCN9P ento+ErOuy5zKqfyjFsyDww7Z1RNq4RBMHHNw357Vl889eutCxqQjID+Ef6cAhsUDtRP8pakJlM u0i0uj3Im7lTZw5RFTJNN+xioFd3DbWHWBRczlcsJT0cRcYmj6j3pEsT3Gr5f0VgAtP5ZebW7ka 9KG+Qd5AHUh/Kky8XT5HiC2N/md6URvVsTB5H X-Google-Smtp-Source: AGHT+IHelkidw/tQQ9RKP0VDtKPsH2g6yNSOnkNt0atUABraIjdPtrs1NJAkAu3tXReVPLd5lAEiMA== X-Received: by 2002:a05:600c:1e1d:b0:453:b44:eb69 with SMTP id 5b1f17b1804b1-4533ca7518dmr224054745e9.13.1750338845548; Thu, 19 Jun 2025 06:14:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 08/20] target/arm/hvf: Log $pc in hvf_unknown_hvc() trace event Date: Thu, 19 Jun 2025 15:13:07 +0200 Message-ID: <20250619131319.47301-9-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339076525116600 Tracing $PC for unknown HVC instructions to not have to look at the disassembled flow of instructions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 4 ++-- target/arm/hvf/trace-events | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 1ff3ff7b91a..ccdadce4766 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -2069,12 +2069,12 @@ int hvf_vcpu_exec(CPUState *cpu) cpu_synchronize_state(cpu); if (arm_cpu->psci_conduit =3D=3D QEMU_PSCI_CONDUIT_HVC) { if (!hvf_handle_psci_call(cpu)) { - trace_hvf_unknown_hvc(env->xregs[0]); + trace_hvf_unknown_hvc(env->pc, env->xregs[0]); /* SMCCC 1.3 section 5.2 says every unknown SMCCC call ret= urns -1 */ env->xregs[0] =3D -1; } } else { - trace_hvf_unknown_hvc(env->xregs[0]); + trace_hvf_unknown_hvc(env->pc, env->xregs[0]); hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); } break; diff --git a/target/arm/hvf/trace-events b/target/arm/hvf/trace-events index a4870e0a5c4..245338c5bf4 100644 --- a/target/arm/hvf/trace-events +++ b/target/arm/hvf/trace-events @@ -5,7 +5,7 @@ hvf_inject_irq(void) "injecting IRQ" hvf_data_abort(uint64_t pc, uint64_t va, uint64_t pa, bool isv, bool iswri= te, bool s1ptw, uint32_t len, uint32_t srt) "data abort: [pc=3D0x%"PRIx64" = va=3D0x%016"PRIx64" pa=3D0x%016"PRIx64" isv=3D%d iswrite=3D%d s1ptw=3D%d le= n=3D%d srt=3D%d]" hvf_sysreg_read(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, ui= nt32_t crm, uint32_t op2, uint64_t val) "sysreg read 0x%08x (op0=3D%d op1= =3D%d crn=3D%d crm=3D%d op2=3D%d) =3D 0x%016"PRIx64 hvf_sysreg_write(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, u= int32_t crm, uint32_t op2, uint64_t val) "sysreg write 0x%08x (op0=3D%d op1= =3D%d crn=3D%d crm=3D%d op2=3D%d, val=3D0x%016"PRIx64")" -hvf_unknown_hvc(uint64_t x0) "unknown HVC! 0x%016"PRIx64 +hvf_unknown_hvc(uint64_t pc, uint64_t x0) "pc=3D0x%"PRIx64" unknown HVC! 0= x%016"PRIx64 hvf_unknown_smc(uint64_t x0) "unknown SMC! 0x%016"PRIx64 hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "exit: 0x%"PRIx64" [= ec=3D0x%x pc=3D0x%"PRIx64"]" hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpu=3D0x%x" --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339107; cv=none; d=zohomail.com; s=zohoarc; b=ElNdSns76JyWfQQrRzdnsfY/qkx1uwUat6HsOTbLG9MTNkETjkbmfv5jF75cESxNl+q/XVvz83z98uWG32ZCg1wPrRcTJjCM5UaWyQdhyzQjr7/UuLGO/hnE69uBm5pqpguUH+rcFzs0j4yignyC7IZnYBb4FaHqiZLaHK/GSbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339107; h=Content-Type: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=z/Q0SIuMdB5kC3di/CRNsGxXg4ReG9T7xi6w1cajMnM=; b=jUYmYFf/BDMQLuFdBvIfrEn9h281vZGRo/ivEIjNSskF9IsWVEB56dUPTdGvTAZQLR81RSzh6zAZ/W6NQ0MrFqh154ZSWlVFgEO/KaLxW5UFrngx5uT1/T0jkXlrzuLhGpZMCb1YJLNpN7+LdGFAIAoZhziyPodxQRUvtpAG0ZE= 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 1750339107520633.4278953835134; Thu, 19 Jun 2025 06:18:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF5x-0003iy-0j; Thu, 19 Jun 2025 09:14:21 -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 1uSF5v-0003i3-7i for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5p-0003wq-Ol for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:18 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-45310223677so6860385e9.0 for ; Thu, 19 Jun 2025 06:14:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45360b1ffacsm14079235e9.36.2025.06.19.06.14.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338851; x=1750943651; 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=z/Q0SIuMdB5kC3di/CRNsGxXg4ReG9T7xi6w1cajMnM=; b=eBj8t8vv5b2ANWyKZEywvyib+LOp4FdcprNZN3nBrE26+NawCS+mK31zc9QpKDM+t4 2HAD/rWIPwVC6e4Jh0uajoivmhyMpvXilLGORSGuD5WXxqIwecmSMCgFOA6mIknO88Ha jV8wH745cybTjW72jurHecsV4JV2/B/rtoSDt8iIbda22CrEAWnNvFFib39stJK79Vsw cqUdGC2vcK+oZQj8QYfEta2yJ/kxmJHKWOPTQuRbcstoZyjD4Y/T+ckkhkb3RnWAf8n8 4pL+nZaRVP8UmAhDnQSlfuaahWCCLquXL3371ktiW/b1T7KFvpDlzu8Xi+yFQkkbEGGi 4Orw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338851; x=1750943651; 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=z/Q0SIuMdB5kC3di/CRNsGxXg4ReG9T7xi6w1cajMnM=; b=gP6nk+QiWOuQZZiDXKQqUajZ81DK0SBqZlaAnRTHs38Um2oH5QBD59V08BQIDdVjJc 0RsAauUUajUQdD6BeH4jn7CI+45A6GAm6B9tKSdr3MUpRhA5lcoZEIDsa/idtHm68GAm nruV35NW3MKQ56SH3vLanqgqiYIfUWRlXVAZ08K6xg5RIyKieETz2VogCB9CxDjJ6Oo5 5EjEPYhItEt7ACkUSE8tyK2Zrcz+h8a+KQNragJVkHr+EExz2SJZ1fV0800KX7dKtggT p1LNKZ/E6G0x1OaXSzP31nhj3mgEqYZkjnjFS6QE5GLxgJ4/SjmAgkGyvg5xE2J8zvpf vsQA== X-Gm-Message-State: AOJu0YyIi/aiMdwKMgq2ylakXld9ZTy4rW4wfBsaZyr/f6N+znhI1Wz/ WjHOZDeA0brQuIF3w5nbCxuzTNAY5My6Ywl6esxCB5B1mCsvtVvLGTUXjfaslAE4mWS4Tj1gC4L U70lEt0U= X-Gm-Gg: ASbGnctIZcLbS1GJfLKQ92LUlMy8hPdLNIxW/fdD5lDbeQ3OtqDAU4MmWeMeqKq2D1C bDRWn1y0idT2AwEKDqbQVwCQpBKqrw3WCgytRtCSM4JuewHSZ8tsakrMQI65TPDMZv9uPi+ZdzC CPvsRa28ppYD93faNjiOg7bBRxfJBJ1pquD+zT4ovz54Uww0ZlDxzL5v0GBwqM+L+QxRMOmEKQ8 STj0UDra4dxeGYSGpf7xahegwIQcPoIrKmdNZycM0zC2IGMXoO0MGUtEezXMi4UbvTA1vy2KYjD Jaygx84eZeHYXXv6y+6v6VfaDw6+5KdK3mSAtjQFyy9mGXWJALFLZoiJ0DIHsaZoDh/pEGh+5+H Pn0UMO/zbOYT9fxJJiZ8SrD9ksAUQyiLztBK/ X-Google-Smtp-Source: AGHT+IEMesaFDUXPkq9vBoDM2hPTxmREKnLlDZqzwkocsesMeu1920AjGfkyio/UWMmuivmVqCXHzw== X-Received: by 2002:a05:6000:18a5:b0:3a4:fbaf:664a with SMTP id ffacd0b85a97d-3a572e6ba5bmr17438618f8f.29.1750338850782; Thu, 19 Jun 2025 06:14:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 09/20] target/arm/hvf: Correct dtb_compatible value Date: Thu, 19 Jun 2025 15:13:08 +0200 Message-ID: <20250619131319.47301-10-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339108919116600 Linux kernel knows how to parse "arm,armv8", not "arm,arm-v8". Fixes: 585df85efea ("hvf: arm: Implement -cpu host") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index ccdadce4766..1fbfdaed59f 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -879,7 +879,7 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) hv_vcpu_exit_t *exit; int i; =20 - ahcf->dtb_compatible =3D "arm,arm-v8"; + ahcf->dtb_compatible =3D "arm,armv8"; ahcf->features =3D (1ULL << ARM_FEATURE_V8) | (1ULL << ARM_FEATURE_NEON) | (1ULL << ARM_FEATURE_AARCH64) | --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339053; cv=none; d=zohomail.com; s=zohoarc; b=KPOGtfLeYoPmiKEDMiWE2pdN4iy+LwJ4iI/dta1NZqHRBlKHMjkPEnLvtQ+V73WzX4RYSW//XsiYVyD1Bl4OQoW+0Vkagds51mao5H5oWGfYySyoBU+K/nX7qNVTnkcI1W8EA5a6HGC/ciHhpSi97kc2lCYV5ictdXTdSxXhEiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339053; h=Content-Type: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=t+CQZzgXVaIFNKsZoeAwh6dF99jW8fzr897tIFidOds=; b=Oqld078sf8P7uJNpuvTl5kk2JSlHJoyrvWxEqpxE5TzyA1r90dEUvO2f2+sbDRIUq9/I0CTiFm7Ezr5ttVUu2io/ldYI6LREQnYzqitoMYp6YavDU1P6hIokkD6YbBzKsqpgwacYn31iLBrReoOLIHRmdcxTmRZ187LPNQAI11E= 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 1750339053480706.5509402548586; Thu, 19 Jun 2025 06:17:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF60-0003qo-7E; Thu, 19 Jun 2025 09:14:24 -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 1uSF5w-0003ij-Ng for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:20 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5v-0003yA-16 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:20 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so5832835e9.1 for ; Thu, 19 Jun 2025 06:14:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535e97ac0fsm29779685e9.3.2025.06.19.06.14.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338856; x=1750943656; 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=t+CQZzgXVaIFNKsZoeAwh6dF99jW8fzr897tIFidOds=; b=mR6efAwiLn384XoRsq/AkktFKwhUCNCK8k1M0BFhvoJd543HC15PAOfsNVv8r348vO tvbDNHonDclg0NdawGzc2HphF1Wj//8QqGTKI18H2opTVSJGR0XPrMYSLN1+8V6dPYjl yjL1u9OUCX/2FZ8fEtk8NlFSNzJQEG26ltEY474VmJJO8JDEN/lxYQ6a9K8e1AB3bSll JKnixVW0VYy7LIy8x+viw5sAirfBvKgTd5FzfPoMJ2cUStjQn8V5OUmgz3CUdlSjlWe/ trIzZDLgMfKIiaOH+watcPnnGAopswHhr0Ul5sFNcD5+EhoX2rQkibaejqBdlI6V8MTv z6kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338856; x=1750943656; 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=t+CQZzgXVaIFNKsZoeAwh6dF99jW8fzr897tIFidOds=; b=WZNOskfCJoQO1H/HTeGgEMuN6umIPKDeMTCGxGa1UOdb6jnGHhRR+FNPO7Dz4SMDf1 Bb/Maz6Dau2Peaix1NnPgysmhXs2MIXuJlFoicgsarDMn+xWMhQAePFNW4ioYKuB7MVZ MZW7aek0OF8GXiFqreGHaN9rRGhptJQEOyVrEFgTZHnENA6okLPp2Y7mg279A5PeqHUn BZ9/8XdF9rJ0psc3sjUvUKQkwiYi8cnJUdqLrzTp/wltep9M8GU7XABeZbZ4teZMJ4x5 2SuhTmUfIPZiwb0WALF/MYpJgNCenDQiSnooKfOPii6+yXDsQaM/5ahLynn8X9f7GhE+ y9sA== X-Gm-Message-State: AOJu0Yw6b9/GtbUEHCYg0rmdbfuPqkD4CHNXARgkyzo+SklBX6bRzR1U Kao0TL0vl2KfhiuM6hoc3vSGLz7oEW/0GP3upjgHyPZnt0i+gq0Xkudzoh6Av6Op4iji9WIzqyl wOYWbNCI= X-Gm-Gg: ASbGncta+GXhTcgWLcRfddatbUppf1fZpeDgEKezYOvK5+i/SvENowScdB35DShBCl9 muKWOokAknVy1jSICV5fkORvYGN2acnXEgZ34jDogQJfufD2T2ql3wXgX4fBgu7ytSSpbAI7qO1 IQ+GUdE6oH7zNkjTpZcUtHNDrcZOdpR5PGmZlUmhlEDXn2S0iZL4Q2QsOp46xQcXGLWoLS1LpdF kK5SZUr2K8I3ae0gFhgWKYwEws+5e3kVlVb7wyVGLTqaoLHsZK1N0Cz0tGI2WriQbo1rR1xtozg yIV20JG/+m4SYKuvOqh6VnUW053FMBXgL2iLb2anQAUv7+Pq/aCdhHPmw5Kp5Lww5KD4f0yRnc/ lr1tRnvkPF5JzM6+tTS+ZX5xPGLEdbtK0/mbmal5pZI4w1Rk= X-Google-Smtp-Source: AGHT+IHxWwthlICtEPbyo/liZr0Yr5cAjas25sh5+S0g5y1XPaawtH+KxbOYIqw/ohgJip5mJzHstg== X-Received: by 2002:a05:600c:1e09:b0:43d:fa58:81d3 with SMTP id 5b1f17b1804b1-4533cac558emr191965565e9.32.1750338856135; Thu, 19 Jun 2025 06:14:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 10/20] target/arm: Restrict system register properties to system binary Date: Thu, 19 Jun 2025 15:13:09 +0200 Message-ID: <20250619131319.47301-11-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339054383116600 Do not expose system-specific properties on user-mode binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index eb0639de719..c99981d88f8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1500,6 +1500,7 @@ static void arm_cpu_initfn(Object *obj) * 0 means "unset, use the default value". That default might vary dependi= ng * on the CPU type, and is set in the realize fn. */ +#ifndef CONFIG_USER_ONLY static const Property arm_cpu_gt_cntfrq_property =3D DEFINE_PROP_UINT64("cntfrq", ARMCPU, gt_cntfrq_hz, 0); =20 @@ -1509,7 +1510,6 @@ static const Property arm_cpu_reset_cbar_property =3D static const Property arm_cpu_reset_hivecs_property =3D DEFINE_PROP_BOOL("reset-hivecs", ARMCPU, reset_hivecs, false); =20 -#ifndef CONFIG_USER_ONLY static const Property arm_cpu_has_el2_property =3D DEFINE_PROP_BOOL("has_el2", ARMCPU, has_el2, true); =20 @@ -1532,6 +1532,7 @@ static const Property arm_cpu_has_neon_property =3D static const Property arm_cpu_has_dsp_property =3D DEFINE_PROP_BOOL("dsp", ARMCPU, has_dsp, true); =20 +#ifndef CONFIG_USER_ONLY static const Property arm_cpu_has_mpu_property =3D DEFINE_PROP_BOOL("has-mpu", ARMCPU, has_mpu, true); =20 @@ -1544,6 +1545,7 @@ static const Property arm_cpu_pmsav7_dregion_property= =3D DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU, pmsav7_dregion, qdev_prop_uint32, uint32_t); +#endif =20 static bool arm_get_pmu(Object *obj, Error **errp) { --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338921; cv=none; d=zohomail.com; s=zohoarc; b=KHjjgfbbASyP3rUgVV+/rPht2KclIra2Wj87YDwAFEh7fCgUdtgmKhJQaN3r8XOCH9v+5MVb5VjOPsnb7gGViZs7hzAvbR6DiPe0W2g1v+LtjFTesLSyxEsDfwDphuLuzyMA5N5exfX1+K1gZA8El4awxR5bN/6nOahPJhkjGAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338921; h=Content-Type: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=MgE23ZXjPhbz5eEFEhot27ybZ4s2rDCHGkAaeKo3otQ=; b=ktFHVkejmEJAxrrq/6hByySlhs2Nw78+tPm86DJiVuL3UwIitfEL/4expeVPE0vzUdlkp/a9AAch4ob5jelwLfttw9kIJjkoEjBtFASSXH/A4ytpB4k1iT30BAv0IDvc+nbcC6rQGIUqXc9ddyUD45GLg5Tzf4NBZfy5fjaidD8= 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 1750338921735377.74768815447885; Thu, 19 Jun 2025 06:15:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF62-0003uv-Ty; Thu, 19 Jun 2025 09:14:27 -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 1uSF60-0003rC-UA for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:24 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF5z-0003zk-9U for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:24 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-451d6ade159so6047105e9.1 for ; Thu, 19 Jun 2025 06:14:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535b683b49sm29415425e9.1.2025.06.19.06.14.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338861; x=1750943661; 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=MgE23ZXjPhbz5eEFEhot27ybZ4s2rDCHGkAaeKo3otQ=; b=JXdUwcRTDo67R7rjPc5bx8fDn7+C/rem3YfsUExafMH5yUMtAXNV0nkDYt3BVuPHfZ 148mrh7kmfULJbtFOyjlsH6u/NFwAz9SCv7z0QVFSUNv8XkIEi9GFhsz242ErZJsVua3 nJQttQjPR6/e3RR+lDoA0hY7Fr0+fbnmRy6GJpN+l2e4K3A56YP1L2367ZKEUkwiCqAb Z9W5KKsED38dNiVsi0ewL/BkgyxrXywKyxcjQztb7Rru5U0nIe0nHRGWnBm1c88MF/oE Q56D4ssrkyR5XylNZWI0KWreoPquWiCxxFp5T/M/kfDex+BvwJaCIjFg6WEKbnJ7cutL yY4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338861; x=1750943661; 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=MgE23ZXjPhbz5eEFEhot27ybZ4s2rDCHGkAaeKo3otQ=; b=pAYUhD20PcEUV/7xUyfeOafuV5ru7JYOaJlwct6+HkW6PZ3AeLuJUU16R8k4z1K52x 6mWMs7mCh2y+H6uoibtP9HaC3M7HuLYqH+m12fLE4hVgjTjFg5Bpv1F4DEqsMeM7RaSz 8V4e8mYcTI7xQMgHHbWuKlUkJ2W5KzUR5g3FzpQtLI7OAeTYz/WXXIZ/OoPd4H2z8dWh A1PQOIFTTnWDmf3c8246MaZu5cVJplaYrkPjnN7vIjC2X7uXNVATBkVHQKMZVapduwKQ tTRikjm3KwvgC0NWSC22DtDVF2sTmIi4HBq22gpUwmYdXRcDGf2IbYrjjRlBGWuon1xe fpOQ== X-Gm-Message-State: AOJu0YzE0UDFmqbYl/UFiyQ+hCN8MlEcl2OK6/9TkUZD+s+REeZhawsg 7qPFuup+XmPFLBuTgeihLKN7xW1ChXe8pqrmiFKBzOujA3LtJrlRhwkFwLXphfoC3bXObA9YdyA xvew6oW0= X-Gm-Gg: ASbGnctT7Ff6ka2bUydyFVpzLh6RWucdyFu6u7ce0yJXeyvNWXzRODpKXvlVZ6/ABPO afybyMUzQ5ixCmLUxGlyUjzLgCYp1qrOAgv1Z2+g0//xtQhLsRQWCsDb5uVmAHzYCQkLBkxoZI2 8DAlBAfMcttaaJ+b/QS9yxG5vIsmYNaht1Rds1TQ2gH8Fr4R9gCQiDkUS5hH1PZ2FiE1PSgn9Sx mXFsr6idlZtbfpg9vtLy9USsKewcak2rBjZhg/ohcwus02JiD/xyGlAALgTwHtrunozmZmRlqjK Za3rqJXRfS56pHM/LzrNLxHFK0Ro9HSxaSrRdnl0XRNKQGEofe0j6a8zLS4qA42KZcsSBnOF9O0 rDn71bkTpz5VPa1KvrDPc7x8u0M9qFqkGo6tO X-Google-Smtp-Source: AGHT+IG/UYI2TYIa9RXcwUa0fUfFK7JoPAY2HMaE1zI4A9LwhSOJHHI/mUd44vJwEgaSqgrYnYu8MA== X-Received: by 2002:a05:6000:4021:b0:3a4:f5f6:b4ab with SMTP id ffacd0b85a97d-3a5723a2e2bmr16674306f8f.30.1750338861305; Thu, 19 Jun 2025 06:14:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 11/20] target/arm: Create GTimers *after* features finalized / accel realized Date: Thu, 19 Jun 2025 15:13:10 +0200 Message-ID: <20250619131319.47301-12-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750338922936116600 Call generic (including accelerator) cpu_realize() handlers *before* setting @gt_cntfrq_hz default Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.c | 65 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index c99981d88f8..102f45442a9 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1986,26 +1986,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) return; } =20 - if (!cpu->gt_cntfrq_hz) { - /* - * 0 means "the board didn't set a value, use the default". (We al= so - * get here for the CONFIG_USER_ONLY case.) - * ARMv8.6 and later CPUs architecturally must use a 1GHz timer; b= efore - * that it was an IMPDEF choice, and QEMU initially picked 62.5MHz, - * which gives a 16ns tick period. - * - * We will use the back-compat value: - * - for QEMU CPU types added before we standardized on 1GHz - * - for versioned machine types with a version of 9.0 or earlier - */ - if (arm_feature(env, ARM_FEATURE_BACKCOMPAT_CNTFRQ) || - cpu->backcompat_cntfrq) { - cpu->gt_cntfrq_hz =3D GTIMER_BACKCOMPAT_HZ; - } else { - cpu->gt_cntfrq_hz =3D GTIMER_DEFAULT_HZ; - } - } - #ifndef CONFIG_USER_ONLY /* The NVIC and M-profile CPU are two halves of a single piece of * hardware; trying to use one without the other is a command line @@ -2052,7 +2032,40 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) return; } } +#endif =20 + cpu_exec_realizefn(cs, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + + arm_cpu_finalize_features(cpu, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + +#ifndef CONFIG_USER_ONLY + if (!cpu->gt_cntfrq_hz) { + /* + * 0 means "the board didn't set a value, use the default". (We al= so + * get here for the CONFIG_USER_ONLY case.) + * ARMv8.6 and later CPUs architecturally must use a 1GHz timer; b= efore + * that it was an IMPDEF choice, and QEMU initially picked 62.5MHz, + * which gives a 16ns tick period. + * + * We will use the back-compat value: + * - for QEMU CPU types added before we standardized on 1GHz + * - for versioned machine types with a version of 9.0 or earlier + */ + if (arm_feature(env, ARM_FEATURE_BACKCOMPAT_CNTFRQ) || + cpu->backcompat_cntfrq) { + cpu->gt_cntfrq_hz =3D GTIMER_BACKCOMPAT_HZ; + } else { + cpu->gt_cntfrq_hz =3D GTIMER_DEFAULT_HZ; + } + } { uint64_t scale =3D gt_cntfrq_period_ns(cpu); =20 @@ -2073,18 +2086,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) } #endif =20 - cpu_exec_realizefn(cs, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - - arm_cpu_finalize_features(cpu, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - #ifdef CONFIG_USER_ONLY /* * User mode relies on IC IVAU instructions to catch modification of --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339164; cv=none; d=zohomail.com; s=zohoarc; b=PEabXIlnXIezzRr3J/RjNMmV2n63L16Yo0Q4FRdmPwb2qr13qHos7BE3XXM+myWInXRsdMD/naIsFksXl0jPSMo3K64F04VuPrV+L2FcXi0mvrzUON0BAfnGgjGKGjDv+BiNuheJvvmzhr7HrzSRAKLj7SJ2vGPK52DCBUX6chc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339164; h=Content-Type: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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=VPTP1fj5TgYiBmTekaA3fotEJVaWb8lp+KvWNSle5AKpjcAvCa+5Q0vHCwAjouX/ySdKIKvxoui81xHgYMTWcEruzEchuTrY6hBi/DjY0P4jEVHQkwJjcpoOSHX8mEJHQckSV/2C1OckeCKA0BVr5uEr4Gcnrir0RzVpGvx5hpQ= 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 1750339164429696.533222093724; Thu, 19 Jun 2025 06:19:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF67-0003wL-Et; Thu, 19 Jun 2025 09:14:31 -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 1uSF66-0003vu-96 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:30 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF64-000413-Gy for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:30 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45362b7adc9so1462125e9.0 for ; Thu, 19 Jun 2025 06:14:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535e97ab95sm29168365e9.7.2025.06.19.06.14.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338866; x=1750943666; 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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=vj1jQJkOCFeAgl2LypV+qDb9Y2mHP/yuk7ThDy49ItUXew3H1PIZ/jbBPZk3Xwzo+1 j/AXQ4QoYiYJoIpE7EOf7YMYrzV62XaEVU6IGssrFae4lUNMncfjq/gsnIFYHlqxWgEV znR78veHeF3WUy5xbjzLJYthVXtyB2te8RDOIOqJX/0don+Dni+bRHjBOPgsIVHovrhU k6OQ9lzHgNLkNNV8pcEcCHD4kz7KT9W/+RT3B10h8nIqBUS8VyV+9AOJVlXJ+80SgI28 +gLlebQ7glEDQfHu6SGbaPmSllvh5RNCowHJ2sECrY9RE+9equxYQeBH4nbCoMKudhDh 05/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338866; x=1750943666; 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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=TIjWZ/B6u2Hcw9rYPQR3DG6vEVVSs2qjZC29uCWn3rZHhQ+S9qJ2cGIKnmz4Ioeg7l uiigastupMJD3LbDLA2x4TTrOiVTY0puJHddkcE172RzvidZNIDugKTJC2UmbGGho52g k3Trb0+BrfgYfdsA5bqTS1wU+uRFiMiWSuwVIpsbdpbOxfT1YB4TPpm92YysiI2cWJGa /rwMwUdYu7zsk20EDz79uT8sONlspq1aMfa/6voi+AT8niCwVmunROpKK8wh6s0LRMcL 7S8wrps8+T1rD2IJHjBMf+aX//qnpDLTjzxtrOkhBGNmLmeQQ4bbq2d+lokH9b/HzPSq ZPQw== X-Gm-Message-State: AOJu0Yyc+vP/Hks/vfsmzvTqnGenqKtM+yC3w+K4wQuP/0Xx6YrZWl64 yZ7M3yETQ6KGWzXkU6MRbEmdyP40wItry4ObIYtef8GD2C0Z0bV/JIRFA9qmRlsZSAZjFmmAgzn 9rMrDVmY= X-Gm-Gg: ASbGncuK8xbqjBDPvdBVPyP6+tg/Y7qDJq53JVuU+lN4Ox7ymcjzNybiPkI11QooV/a 7lN/K+DGSwnNP/Yt9J6nnfayJP9HXkRFjFsWp5pWFnlxZR+sdZaQBfzXQhlpvshcpU6WapL/mx+ ALkaK2D6Vh1NyE5uIwiN3WQx0hcp6AiBF8NpX9Bk7UA+Le9dFxm6trOVdjJp3gYpIIlquMNdBtI k/qvCa44IgKXtZJ7obK+8uxks4MRBRPEjDSQuxV/+SIyJmYMR1kS1rEC4QsD6DJUPGLViCDjoLV Df5DeNJmjENBccluD74t/fcLZqAZpkUVNwrWDlVZ7WSzl3agzMkMO02nyOofgL1X1rhinoW3pjO ySUPkMPIdyjwn7xHGFCZHwebOabBquwoVB9oy X-Google-Smtp-Source: AGHT+IEKAPBge8NVooEgnnBCRSTl7DwqXrW7+BrRtP165DuwJl3JVN8xsSMQZ37LDKLlIe59+hrX4g== X-Received: by 2002:a05:600c:6388:b0:43d:174:2668 with SMTP id 5b1f17b1804b1-4535fd55e92mr22427315e9.0.1750338866441; Thu, 19 Jun 2025 06:14:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 12/20] accel: Keep reference to AccelOpsClass in AccelClass Date: Thu, 19 Jun 2025 15:13:11 +0200 Message-ID: <20250619131319.47301-13-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750339165602116600 Allow dereferencing AccelOpsClass outside of accel/accel-system.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/accel.h | 3 +++ include/system/accel-ops.h | 3 ++- accel/accel-common.c | 1 + accel/accel-system.c | 3 ++- accel/tcg/tcg-accel-ops.c | 4 +++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index fbd3d897fef..9dea3145429 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -37,6 +37,9 @@ typedef struct AccelClass { /*< public >*/ =20 const char *name; + /* Cached by accel_init_ops_interfaces() when created */ + AccelOpsClass *ops; + int (*init_machine)(MachineState *ms); bool (*cpu_common_realize)(CPUState *cpu, Error **errp); void (*cpu_common_unrealize)(CPUState *cpu); diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 4c99d25aeff..44b37592d02 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -10,6 +10,7 @@ #ifndef ACCEL_OPS_H #define ACCEL_OPS_H =20 +#include "qemu/accel.h" #include "exec/vaddr.h" #include "qom/object.h" =20 @@ -31,7 +32,7 @@ struct AccelOpsClass { /*< public >*/ =20 /* initialization function called when accel is chosen */ - void (*ops_init)(AccelOpsClass *ops); + void (*ops_init)(AccelClass *ac); =20 bool (*cpus_are_resettable)(void); void (*cpu_reset_hold)(CPUState *cpu); diff --git a/accel/accel-common.c b/accel/accel-common.c index 4894b98d64a..56d88940f92 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qemu/accel.h" #include "qemu/target-info.h" +#include "system/accel-ops.h" #include "accel/accel-cpu.h" #include "accel-internal.h" =20 diff --git a/accel/accel-system.c b/accel/accel-system.c index a0f562ae9ff..64bc991b1ce 100644 --- a/accel/accel-system.c +++ b/accel/accel-system.c @@ -85,8 +85,9 @@ void accel_init_ops_interfaces(AccelClass *ac) * non-NULL create_vcpu_thread operation. */ ops =3D ACCEL_OPS_CLASS(oc); + ac->ops =3D ops; if (ops->ops_init) { - ops->ops_init(ops); + ops->ops_init(ac); } cpus_register_accel(ops); } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index b24d6a75625..da2e22a7dff 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -198,8 +198,10 @@ static inline void tcg_remove_all_breakpoints(CPUState= *cpu) cpu_watchpoint_remove_all(cpu, BP_GDB); } =20 -static void tcg_accel_ops_init(AccelOpsClass *ops) +static void tcg_accel_ops_init(AccelClass *ac) { + AccelOpsClass *ops =3D ac->ops; + if (qemu_tcg_mttcg_enabled()) { ops->create_vcpu_thread =3D mttcg_start_vcpu_thread; ops->kick_vcpu_thread =3D mttcg_kick_vcpu_thread; --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339053; cv=none; d=zohomail.com; s=zohoarc; b=ZElae2QhEvCiOBk2jurtJNdT16rFhlaMTsNxX6YVqYDDBAniWdDQP99FVSIbh3CYtRWCGNAxm//NB147O0uRDwJxOWJE6PM20Atcn72d1AsgKN9yThHBR036eva8DOVJGe7Ani7UaDBV2Kae0ebeimXtc0riIu2QxIb06LFoPuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339053; h=Content-Type: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=Fteu42QoSrS1hfDvjcW70gOANYEhePCaBpCVcvmvL2M=; b=O3ZAPO6ZVQ0/5j8dV1/SCP10PFgeKnXTR0tDNnMHcvDQ93c6AmN1Lu9p/5vvsIabdyJCbziamLVbEwPw4Idd5psrdWp8MG0KNg5ujzyosi00xZBMu05V3ik+57ZB3n4lGLE0skHEg2Qgm66FMZQsS7+rFt3pzmbBq8jJjY9T+ck= 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 1750339053015989.0418170885596; Thu, 19 Jun 2025 06:17:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6D-00046h-J7; Thu, 19 Jun 2025 09:14:37 -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 1uSF6B-00042O-Ed for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:35 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF69-00042G-NE for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:35 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a528243636so517959f8f.3 for ; Thu, 19 Jun 2025 06:14:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b1bc97sm19654066f8f.68.2025.06.19.06.14.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338872; x=1750943672; 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=Fteu42QoSrS1hfDvjcW70gOANYEhePCaBpCVcvmvL2M=; b=Do/GVJU71G8EFl0Vy02iQOZvxSQGd57JvVjKg0GJHfPVReyqmIGHNhJEtHUrTl3kHz D9kMKr4JBfuBmo94v3P68fLoEQ7Ue4aTczJvKCoJmJ0IAHqlTXml5h7AYsbBbWRgEi6h MTlYGckeIPR8dFGb57P170Cq9fI8rSK3NO8hHDe6HkCOuOV6HFlzK6TEhEc7y3hSSsk3 pUedIlj7y7QV+00iJJqBYa0pAv0DtJSGk75AMg8I2jCUgifCrpZnPzAtNxmcQlHsDEK4 t1a7r1yCCiXiSB9uWsMEn5V7HW8T+0R9ykwihovxK1ZRbjb5P1QWzwE+nS1Xq2oMZ1RW 1MTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338872; x=1750943672; 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=Fteu42QoSrS1hfDvjcW70gOANYEhePCaBpCVcvmvL2M=; b=r69L8zmmbIHSqnsPPca8qhjEjJsk8LQSwqJUVoxFMPFOdEsOUzctUC03Rjm7a+Rr+t sV6suswROjulMXJyKgSk0DJ1/ktww9vJJEiZFUnWvuHdtiqG0olPJTci2fn4lBspsUIK A0OH3r4fowcV/jcrnMINGBs9v3Kf9QEc6xKceo9bUxFUdvLgAde2DJdJ23/RjGu4SBce wSv7MVl9NvbAqMsSM3xuTFhxMoDduSxiWpEhxoC1PRVKg4CNSiUTg9v4SzF9k9D7Hvtj dp995tUHeF2h2lqegp3/ayLuyglSGs2k7jQx4WpegLs0zeYCSP6cVluTwszEJ0ZrFkJA AlXw== X-Gm-Message-State: AOJu0YzonC+CCAd1ouX8RK2Qi6Vt0mzPUQlNNqz2YE5sSVlom3/VPtpB /rM1ywq4YweudoJBnKnIdDrGfwxO50duWevJsQVbWC2dDmxUnTnRTApb7N95V+98swxJ9mhik+p NLxXWyCw= X-Gm-Gg: ASbGncsSc0SF6rsxLh1lW1bDFKZlkXI1kAUuosqU8KRY4KRfTzPx/95g6d2UXFvXmlg CBYo40lu6WgZ3BPZxxT0/g4OzhBzmxmV0KA0tu/M/WoRc4Anp2+/DvWNt0PhO+7EfDritvmGDfG ceMigm7kV/qbDAN/iHxbRlrgIrgNYAc0zFEH4qxcadKWNYzyxBEcUCiy32TMBTEiRDmVw6twbgc VuqFf2wlnW+gbKrYsfs0byiRcNijalEfj1qAuVkqoOvnS/CGYR0ig0Z/IKbH9qxP39XoAkA12E9 tb8m7SGRDKcs6BDqc3fy1SUPJqUAJITWkKAcHp0BNz3fX7JKvk+nWae7Lnj+cgfmTBFb6JhYs4g wK6D96YF2Bu01UyslH5XyirzIa2mAeca3pCxx X-Google-Smtp-Source: AGHT+IGFsjyeXWntOOT6DxV4WwpLZcxrPw3Vv2X9REiOSlt/evxYNtcIXAR3/IHz9oPPkw1DpS+h9g== X-Received: by 2002:a05:6000:402a:b0:3a5:27ba:47ba with SMTP id ffacd0b85a97d-3a572e925c6mr18063847f8f.44.1750338871833; Thu, 19 Jun 2025 06:14:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 13/20] accel: Introduce AccelOpsClass::cpu_target_realize() hook Date: Thu, 19 Jun 2025 15:13:12 +0200 Message-ID: <20250619131319.47301-14-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750339054358116600 Allow accelerators to set vCPU properties before its realization. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/accel-ops.h | 1 + accel/accel-common.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 44b37592d02..a863fe59388 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -35,6 +35,7 @@ struct AccelOpsClass { void (*ops_init)(AccelClass *ac); =20 bool (*cpus_are_resettable)(void); + bool (*cpu_target_realize)(CPUState *cpu, Error **errp); void (*cpu_reset_hold)(CPUState *cpu); =20 void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ diff --git a/accel/accel-common.c b/accel/accel-common.c index 56d88940f92..55d21b63a48 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -105,6 +105,9 @@ bool accel_cpu_common_realize(CPUState *cpu, Error **er= rp) if (acc->cpu_common_realize && !acc->cpu_common_realize(cpu, errp)) { return false; } + if (acc->ops->cpu_target_realize && !acc->ops->cpu_target_realize(cpu,= errp)) { + return false; + } =20 return true; } --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339119; cv=none; d=zohomail.com; s=zohoarc; b=kXD4tZaOHDms0FGSqCRbYlREzeZ5hMjIY+d4cxSiRTPtYl6oArox03B8bbhJN/4cxx+c40bopzFyzF+BxL275ddDBicwvGm17Npceyx5eQqYoLY/bxCrxlGYxV3QDRFctLUEPxqxHRQvinh/U5pe/A24WbqhB7+27QoDTlSti44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339119; h=Content-Type: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=vBwegXGmW2xI9QNEHAmJjIKzsQveZBksCJkfDcZvi14=; b=Mkjfwx4UNQ8DuS7/rLKWZiwMMkNNpA92bu4kG2IevNjUYVCq1jwuVVjvFm4ypDk2geUM/l3tbYsbLZ26LSGrHUJsAPz9jTnFuD/qBR9HZ9KO1K1TWcyCfCmhuqEdTxzkD5cIgiuFSAXITlw/A7rx7qA7X9+sEj/giIwowbpOQsE= 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 1750339119794255.43816233925043; Thu, 19 Jun 2025 06:18:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6Z-0004m0-Ui; Thu, 19 Jun 2025 09:15:00 -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 1uSF6H-0004S6-Ef for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:42 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6F-00043p-Dn for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:41 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a53359dea5so494907f8f.0 for ; Thu, 19 Jun 2025 06:14:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b7741bsm19777232f8f.98.2025.06.19.06.14.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338877; x=1750943677; 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=vBwegXGmW2xI9QNEHAmJjIKzsQveZBksCJkfDcZvi14=; b=UUThBdmUIe22DkfqJibiyCvQvqYfB4ylLJ4pLuUVr9kNRAZcjLOs+1BQqoSEXaVTin VIBg+wUAxVwx895dqg6qEQcEH31N5zRRS6XmgYJr+JXezvASO5UnT7Lqz7jFSebcOSbj Qbv3SWuwfP2tNyV7pcj9WLTMA3EazBi3IkvERLgy3UTvHVvKiTHbmwX+lHiQbFGzsnEa R4eASb0gZap12XimLzhgvc3eizOrkotsMGje2BguUZ6WRX4wnpeeh6XzVIW+7VjpWNtH NDaokPz8YsmbOTIibasXrBq20357IvtJjQYTwKTPZ2wgaqpljURL9ceg1ygJGYVm/w4E Rhbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338877; x=1750943677; 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=vBwegXGmW2xI9QNEHAmJjIKzsQveZBksCJkfDcZvi14=; b=KjSPB0Snf/GWH+A9qv6hTrEwb1cwHmPIdN2aqvk5zQbccOJCjDaywyC2hVNOD4SqT1 5OvaORRetTx17LjP0ZW+5CR9sSWAGrpFFhBHuFvyzswDWuIjkZJHBaX8E5trvRb6ISF3 WcW7iyqVPGytkXDMy0gdV2x1SojqVNgliSMy8l96ro613+xKKk5QiKTA6dvOZR+M2YE4 CT6gKS1ojSpA7Pz/a5J33S+SEENwE99wcbzpCFBecakP2OIBU9ZZt1qVL419aXv5jgJP y9TXIp6lojteg7lo0Wtumhrqd9G5m5tfMEcWxzCAtDdNnOr8tUib+vmr2ipGKvhQEXI7 jBvA== X-Gm-Message-State: AOJu0Yznus3XaFMhS0UGugy012DHAnvvGD5XNWSQKZLQsepn14ocIX3S WUBXOueTavNsgD9ICea4P3FJid1mbzR/HWwkAWdLSVl0d1+a7RRDdXjihL0sBdNz5UfTbvdBRXT +VdzpGJc= X-Gm-Gg: ASbGncuw7jU1MjBcarkxbJICw8y4IcN5tVd7XEwtgttN40xirjuF0MQjKxbunpfHQ50 ZzvpgxzCvgpuF4dFZbD7EQVPmHXl+SSb+2Be2dRoo3vloKKa2mOAPZmuMtMYlybSI9oD8ypp55F AYXuAgTQxnMocIZk/O0hGoWX2S0I0pBUv5owd6CYYOd+DOTderoSSpdsUmjFxoXwFMVJwTUZDDF 1G7sMLsVtfal0penQuYp+zVFaDIqz4u8qfMtcijpN/X2O3LnqjfLFw4aqhue2oTkqjOANf8OL+R mbizoGlsSWp4PyLcL9itXqHcxL8+oQBNUXD3M1krTO1+R9bCdJ5x8Z0K6+ByWAz4vInAmuF0dBA K8h7mshUssP0Erlx1PnYqzzgpYWr6Hc+cpSJi X-Google-Smtp-Source: AGHT+IGphVnwIkNy8mgxx1bMSCUP1PYKYP3HE8EUL+SUsHxrYE2Vhs26H5k6O4fJy9ktfqkBuAu1MA== X-Received: by 2002:a5d:64ee:0:b0:3a4:f744:e00c with SMTP id ffacd0b85a97d-3a5723a2dafmr16025163f8f.29.1750338876992; Thu, 19 Jun 2025 06:14:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 14/20] accel/hvf: Add hvf_arch_cpu_realize() stubs Date: Thu, 19 Jun 2025 15:13:13 +0200 Message-ID: <20250619131319.47301-15-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339121075116600 Implement HVF AccelOpsClass::cpu_target_realize() hook as empty stubs. Target implementations will come separately. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/hvf.h | 3 +++ accel/hvf/hvf-accel-ops.c | 2 ++ target/arm/hvf/hvf.c | 5 +++++ target/i386/hvf/hvf.c | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/include/system/hvf.h b/include/system/hvf.h index a9a502f0c8f..8c4409a13f1 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -72,6 +72,9 @@ void hvf_arch_update_guest_debug(CPUState *cpu); * Return whether the guest supports debugging. */ bool hvf_arch_supports_guest_debug(void); + +bool hvf_arch_cpu_realize(CPUState *cpu, Error **errp); + #endif /* COMPILING_PER_TARGET */ =20 #endif diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index b38977207d2..b9511103a75 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -588,6 +588,8 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, c= onst void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 + ops->cpu_target_realize =3D hvf_arch_cpu_realize; + ops->create_vcpu_thread =3D hvf_start_vcpu_thread; ops->kick_vcpu_thread =3D hvf_kick_vcpu_thread; =20 diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 1fbfdaed59f..632751d1eab 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1078,6 +1078,11 @@ int hvf_arch_init_vcpu(CPUState *cpu) return 0; } =20 +bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) +{ + return true; +} + void hvf_kick_vcpu_thread(CPUState *cpu) { cpus_kick_thread(cpu); diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 99e37a33e50..28484496710 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -367,6 +367,11 @@ int hvf_arch_init_vcpu(CPUState *cpu) return 0; } =20 +bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) +{ + return true; +} + static void hvf_store_events(CPUState *cpu, uint32_t ins_len, uint64_t idt= vec_info) { X86CPU *x86_cpu =3D X86_CPU(cpu); --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339053; cv=none; d=zohomail.com; s=zohoarc; b=BEw12RINRO8cnxfu1ou0k0DKEuh5igU6IUsf55wXZLR6SplQ7fVMgJTy3L/D71WWO8FRqcrWa/t/qbcZY85jzCtiiyF+56IZ2iaHV4hrNbt3BwASqA/TsFNZYcpqOaXiAsY/QHdHjtHPnclgNCRZ5iOkUEk0bPmLryFDwqPCEzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339053; h=Content-Type: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=4TTsVWGK24wAjdPt8HIDq+esVA7ZY3jqwbKqWeNJBVE=; b=WuCJCUYNOSNkIgcFQ3tujZPh5jSb5kCiuM4KD9+lunTnbYqSCkqDBjwlt8UGCd2slYz+8NKt4oYveE5bTGTWmnSHLQjaXVRV3clPQsW5QsYEsk1z7utL5mgfZBJj9yw8nUA+DJlfZTL+B0P9V121rZIVb3SOzM+kVA4drbA4smM= 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 1750339053216398.09044118539884; Thu, 19 Jun 2025 06:17:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6g-00050K-Ob; Thu, 19 Jun 2025 09:15:07 -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 1uSF6P-0004Xy-6B for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:51 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6M-00044e-Da for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:48 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45348bff79fso9543035e9.2 for ; Thu, 19 Jun 2025 06:14:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ef6edbesm26382285e9.20.2025.06.19.06.14.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338882; x=1750943682; 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=4TTsVWGK24wAjdPt8HIDq+esVA7ZY3jqwbKqWeNJBVE=; b=ag2NNtCdPHKpDlA0ZzHtuoJzQUUMom3xc66a5RiWx6riH38JOEceyalaMdCvKvJhfn qHsAvvA7LCIMvkZbTRCwhzFqVHEXRJRBl9HXSYaxyu41v/KghTYdDr23jsbhq1y6RzD5 zfJR6+7iUW2sdsp1A7ENUn74gdpG/m0V5MATwLCXr/BNt6sSBIOSJVybvJLLb/Yq7uQ/ nIV6R68qH8itK4qwIbme9Q2g9xPgtRlUF+FDP02pI84dv//5Uzjn+SYlQ8LAyC8Qsj1U p9MjICD9a113f69HyDQ+tHWgv7D+fDvVX4uixSHO25NVYMFdHge0PzlSJ1iR7l3W/AT5 lzJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338882; x=1750943682; 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=4TTsVWGK24wAjdPt8HIDq+esVA7ZY3jqwbKqWeNJBVE=; b=Z30dURnKyxAJ2LdfMRYh0qxYLLn7zdYxJuKtps2/dkGwbaEsO7ytp3fdWAa5V99fop rNYOVthKshlVbO4xiuqZVUjgVywQ+gLkFzPLf+w2ekPtMVFYb/Qy8uE8ufYd4heYTj3b fB5/anG5XZYDD5ynatBnRVZZbSbLD69Up6IGjrGQMcsRctmvQWqAxPNIBKq0muo57TBm vOHAxEvc5vevRPUgisk161tOvke/N0pu24c6i0VXeZxYyZGMkqMsSjCIDQiujiFEpSXH iskpeA/XLrhWk02srRFNJyH57Mb1jtuzV2HI/yacPC1+M49spHbmUuO4DCyoKuS6qV92 7LPQ== X-Gm-Message-State: AOJu0YyH3FCiq3QBJ7cUpqWntBfTJj/i2GQj413CcR46GhzsMP1fYcbF pwGm5Io7WrU/zxIz+KbsTvwxt9hJNb79gX9DoYj/rYf069GsUhIX1r/fKN+5G4pvvXufoHBT7l9 rVQLRikc= X-Gm-Gg: ASbGncubCbuVzs/Hj06bZSGi0T4AnbZLY4QMbpHmk0GKo3Xw7fBRrzSzSVXoXq78dR2 NwdYepx710eFdhmX5xT+xsxuGqU8R61L5v/WQx79PoW1XhpepWiohwH20S5UXBYx0KBO0WBY359 UCkaNr+hnXKfLhVc8KmWTVSn9CRq+Flp9Wr621VQh87iFfU3DD5tyuKeCqDIQIszALZ7bZPRhvl 9fxJVLgv9xjxhB+aXs8f6/kSA0kf+4WaVmJeqrPlCjEZotfoapN+AAEN3NgbQfJmASebZZWZP/2 d2Asehl7Gcj5Ef5nmAQfEtkt6aQrkhAHBsbUTQASNg94uAmQ+hyO5T+lQT1ZCngO0sKN4XbjNCB beW0mJFg4mGRcABVzbTMKxYcTNWX57aOOBkAStYI0bzgM0Uk= X-Google-Smtp-Source: AGHT+IE0UJ/OKRN13EAAVAiGqkOfuQ3hywjomt6DtP+BfeCmZE/SGHvtR8ilW3FX7DRO6yFsM24vUQ== X-Received: by 2002:a05:600c:1c28:b0:43c:ec97:75db with SMTP id 5b1f17b1804b1-4533caa35c3mr199299745e9.11.1750338882244; Thu, 19 Jun 2025 06:14:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 15/20] target/arm/hvf: Really set Generic Timer counter frequency Date: Thu, 19 Jun 2025 15:13:14 +0200 Message-ID: <20250619131319.47301-16-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339054353116600 Setting ARMCPU::gt_cntfrq_hz in hvf_arch_init_vcpu() is not correct because the timers have already be initialized with the default frequency. Set it earlier in the AccelOpsClass::cpu_target_realize() handler instead, and assert the value is correct when reaching hvf_arch_init_vcpu(). Fixes: a1477da3dde ("hvf: Add Apple Silicon support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 632751d1eab..fce02d22ef9 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1008,12 +1008,16 @@ int hvf_arch_init_vcpu(CPUState *cpu) CPUARMState *env =3D &arm_cpu->env; uint32_t sregs_match_len =3D ARRAY_SIZE(hvf_sreg_match); uint32_t sregs_cnt =3D 0; + uint64_t freq_hz =3D 0; uint64_t pfr; hv_return_t ret; int i; =20 env->aarch64 =3D true; - asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(arm_cpu->gt_cntfrq_hz)); + + /* system count frequency sanity check */ + asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(freq_hz)); + assert(arm_cpu->gt_cntfrq_hz =3D=3D freq_hz); =20 /* Allocate enough space for our sysreg sync */ arm_cpu->cpreg_indexes =3D g_renew(uint64_t, arm_cpu->cpreg_indexes, @@ -1080,6 +1084,10 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) { + ARMCPU *cpu =3D ARM_CPU(cs); + + asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(cpu->gt_cntfrq_hz)); + return true; } =20 --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338950; cv=none; d=zohomail.com; s=zohoarc; b=GLk585MzMiy+8ORg3jydnzl5LI0++iwgk3FM2GbP8/qaWp17l6yBO+5jOfXafbLfclO0/h83kRcw10/1f1ixfidvtv05XKnM9scBsmnTII+UsNI6DB5rsYh9DkGBB1vA/cvGHayNhA95uVs1WIfPre4SzzT2Hqvt7q2FU0CR694= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338950; h=Content-Type: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=qEhVLrdb7gQcxLJ9m8XmAJvi0CaJW+OAP6dVQwdaX2k=; b=cM3ifr8W6m4+yA7O/RDFwp+BR8VpWBNG5Sn6LZ+vGkJ6eIGN+v2rN3L8mS9h+cQZyYe/UzkD5mw+vypFmE0sMPsUOi3b4P+w6qhpeRMscerD0utItqoco2COP3h3hzgHZNzopO1UafuERymn3mPWVrJq67dJODX2UfvnjIiCqWk= 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 1750338950752465.07698117409234; Thu, 19 Jun 2025 06:15:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6c-0004s6-Rl; Thu, 19 Jun 2025 09:15:04 -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 1uSF6R-0004YG-DW for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:52 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6P-00045J-8O for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:50 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a54690d369so804223f8f.3 for ; Thu, 19 Jun 2025 06:14:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b3c0d3sm19567460f8f.79.2025.06.19.06.14.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338887; x=1750943687; 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=qEhVLrdb7gQcxLJ9m8XmAJvi0CaJW+OAP6dVQwdaX2k=; b=co7q2S5zL8CPzJxxoclKDk9sDlkWepTKCxbde9rcpi2wi48fAxRgtak5HevxKNHPlP YF4cknyXNNkbOR91IqpCUnaU5tpbB3C4JWylSV7miW0axAZU71G99qcLxQjxsu97iLXm w9JJewA19g2yAPTCxAxjcY5KaYBlEgxZhNunrDZMd/67j4gnWs2FdFQXVg2iNVrbB7E8 7cETyEPMWTzVAgn5PVpzUgQ94+cgQLZA1Bh35NzYnVA3R/0vc6AMbRcPl7qJ4/JIzD4M z0A8JyaLqI+cfBosWi3DlIqf9dUiURZf4bR1qGRcOLlsmGiRhji4VfXc5qEzdtK2sGE+ 1Ykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338887; x=1750943687; 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=qEhVLrdb7gQcxLJ9m8XmAJvi0CaJW+OAP6dVQwdaX2k=; b=CV0dguBoHZix477TeGKTSrhk3EkBQocGPuDMSJ3MMwvhciHq0ROlUkUFAy8+/nYA9Q yj5o74Qm9s0qkl2T2dMg7QJTmWtU9eIaJNy/oxuUrIUl48YP0cXmXRMqSyNPuT4NJ30X P0v9MbTPHfKqOFtGZL1/QUVL35wC7jXz9qvERTIyU/zgpElad7SCshuItHZykdhuWaL+ 1VbqittbXk4j95FzUds25E0Bwcandzkj0qO+mc4zWBGZXfcEE0ZMmf9bGaOblGDFQJdc CzXVduHbh+xyt/WJqL9bgpf7EpkbMMYjW8UKcPK9Q/QXUZAkb6iEngT8IVLOv/mc0Ddt Yqjw== X-Gm-Message-State: AOJu0YxCfAISo/ov9WVxRWesKGgqs2rIJh/xI57zRbL70kPJq6y9aaeB +X1Zn0tkiZ0rHpNmOzSVOE/syfSWdWPDm978lgeqEMTI6zWWLsDLEMIXA7G7yrVyxR1KbnlPJvM YZASOGPc= X-Gm-Gg: ASbGncs+jciGooxSeiqiRWunhjr8+gKSdIVKpS1bFmoohEU0FBItzXX+mnQKrPx/L54 vBLontxgGA2SQGw3E3YO9c3+XozBnOP9jT1uzIz2E9y5oa8OhmeirQTHNjn0et4/jRapkMN5vQI A59ZBGt3Eqvln9Y0EZcFKltXmIH+qPXo1HwWw10ILA6pKsU9t3cq6rAO3+3AdqaNCn/uungoK1X /U7Www+p3fkexhNOzhIlw0kHMmjvC5XQH7Kuhlc2Y0ruccqDX/8QnJtHW4Fj/yCq/AwFLu+pstE vmaIX08SrYGWOuRq9kH/cmYksIPI4jCNhOxcvnjLf/pad8xXuV9P62tJQVxTOS1u+7mpWBSau6O i17qqwfNZanEse2SgwS8Fj6Znm9mM3avWvJAB X-Google-Smtp-Source: AGHT+IFYyws/hie04Gs7cz38N8DD6RmjvKvx7LAHAf6xXnGxdc9ttG/TDPs6rEuwn9zHE+u/jqYJ/g== X-Received: by 2002:a05:6000:18ac:b0:3a4:f6fe:5244 with SMTP id ffacd0b85a97d-3a572367b13mr17405974f8f.12.1750338887297; Thu, 19 Jun 2025 06:14:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 16/20] hw/arm/virt: Only require TCG || QTest to use TrustZone Date: Thu, 19 Jun 2025 15:13:15 +0200 Message-ID: <20250619131319.47301-17-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750338952829116600 We only need TCG (or QTest) to use TrustZone, whether KVM or HVF are used is not relevant. Reported-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 99fde5836c9..b49d8579161 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2203,7 +2203,7 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->secure && (kvm_enabled() || hvf_enabled())) { + if (vms->secure && !tcg_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Security extensions (TrustZone) to the guest CPU", current_accel_name()); --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750338935; cv=none; d=zohomail.com; s=zohoarc; b=Bkg7KeRZCE4m5FUo0fsK6gdEF+GJRYKqHYwo0LxqwY7JKfTKSfsIhkcAjIkBWLYQTFYJCktexcYsyk/XhjEvlO8ERjWp20NTLmmncAQGS/tI0CPOHp3JCenBsukP7sCdK+YwUneq/2Pg3dlelq7b+Qiay7JgCxUO/h7MAHRWXl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750338935; h=Content-Type: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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=Rh26vEWATWqAHL2CVTqz40wDVwRQ8hq3vik8RrNP9bflO+Q/w8TD7YjIJ0Xw8X2w7IqiMknycfNK43m4sT1ijWo/t6PoOThEravPwNlYnxG+9oTHLpfJqlUdS5bMy4XGe0zSF3asUVJ8qxyMj73S/p7oOTeaGwku5com5+JXlak= 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 1750338935012841.6377060463765; Thu, 19 Jun 2025 06:15:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6o-0005gv-Hw; Thu, 19 Jun 2025 09:15:14 -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 1uSF6W-0004g3-F8 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6U-00046S-IB for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:14:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-453398e90e9so5585665e9.1 for ; Thu, 19 Jun 2025 06:14:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b08a2bsm19821758f8f.62.2025.06.19.06.14.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338892; x=1750943692; 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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=rxr+yNa5eBF0qgIw/DtjD31RT+nWC5fRCsQ6qa5h2TmeOu0tuqr2Coo/tUjc144Yni hKuzft6AcywGlBl6ji0ynb8P2dMHlfqkwqUOGwBpoejkq13g3oEabGb8/0fIiNom3Wzk DbUg9ht1gtZYK8YDBaMfap2FsoXnCGrBGXQMXCpscfYmLcSNaz9irY+tD7WVPff8AVZQ pD5PRNDJIzLyTVoUT5bSJSmy4QBn41Db97yC7kT5Wa0nLnvj/J7WIbU8Hnno42utwoex hag4/HavIxmK2NnRwspBVpgwr777xee8KqDcZbTQqgCdexi2movhgJcUWfsMAnYO6YzX 9Gfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338892; x=1750943692; 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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=XRBlXTinRI/r6esw4BPb5fwNwOeTih+4loZtKZfaOHKlvCQWDk050qFPdPfWl4C2vK JXLDprFVZfvEBMxkoZlJQOJMapcz4TPw+4Y7p7U0trbT5Cjf+BogSaSdyQx+g88xQC4W EcyFC6Q5LXYseqIZKZF8bdGEnJsOuGMFGjBbChY91rsfnF77GwzxhjAUPfcjaOTrqNK7 abCVtSnReBsjRT9yja5uyhgdjwvmJvg+4djLC73bgoyCi4Yzqy2Q955t0/fo1o52k2Nn M6o34Hem7N63/wHObW3ROYUsug64jGbj+6vaF27HkP5DRDMN9bhUti3fYGXuIRhXci1J teTw== X-Gm-Message-State: AOJu0YzPkx9uF8KEZu2mwhGS2WNu5aqkHEo8JE3sqJvSdnPsJK9HNKrA 6BgGar3xQUSxQQLUJas+BqcwydU1bIFHW8kP3TGBmmEuLOPL1JaV0WcA++x70RLyvNZyDBJlqwN G079gipc= X-Gm-Gg: ASbGnctrL5rxTnmfBPIvokPhL1QD5iRpgZCQk3krkLmMs/uvTKX1nwLq1l17I7/aAAS tvcMw3CbCA4zGYi/fJ2FOLM/p9EFuys2efGs117l4cXGPwp+eF3lVz6/olr1sbSe3sewqn+YFj7 Ai0oH+0el39yv18I6gH0eiGWQJBpj3O0m1gJdWGhNkTJwq4fCwMRkbdN085lcsXd7kN2SGPKLtT OPACCUau39C/n3LUvn0SiFXdmy3NQyCVILhZ6KT5yDLi4PCTDhyjRn9+YKsbdxwB7R3QeMZFf9Z 9oed2TpNLsg0ulBFKs8Ql1EfOCkhKZ69K3117scqt4IA0Qgd+kryDqNcAnMGWsvYuQGuD7cTR8a O3EUX30GvHhFUjhtnzjF8skkESxVjyj3D27Hn X-Google-Smtp-Source: AGHT+IFRzQ9UxBLRQDMQufclV3QAFXCf4Tt17IF9sdJksupv+14Rk4NJ6wBb4VS4a8pKINqsmbco+Q== X-Received: by 2002:a5d:64ce:0:b0:3a3:6b07:20a1 with SMTP id ffacd0b85a97d-3a572e8c1dfmr16026113f8f.40.1750338892503; Thu, 19 Jun 2025 06:14:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 17/20] hw/arm/virt: Only require TCG || QTest to use virtualization extension Date: Thu, 19 Jun 2025 15:13:16 +0200 Message-ID: <20250619131319.47301-18-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750338937006116600 We can not start in EL2 / EL3 with anything but TCG (or QTest); whether KVM or HVF are used is not relevant. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b49d8579161..a9099570faa 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2210,7 +2210,7 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->virt && (kvm_enabled() || hvf_enabled())) { + if (vms->virt && !tcg_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339112; cv=none; d=zohomail.com; s=zohoarc; b=Covr41Bb2hj3SPCFydgmfLe2UPHdxXETD2/9XFcZOAOebSzBClhbcRgf9eR+KeZy9VOKxgoNC5XaK8Ldlv4m0oUZ2FZWeZvlTU+aU+jskmGbxTyYrJCiQ5xxi5ieFrxGOxYEBGcEvjhqcCH93PAIdjT6fXwrhOMrK2lSgTrAiCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339112; h=Content-Type: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=y5LZcCqNpH4GazYoT4HEePjvcf7hcAUKrr97H91/oS0=; b=XPbbsoICViHHcC0Fd2wSxn+N6hnXU1naWfMCm9DWLoF/9fRANSdsCh18xjtbBuCLqGIvm5ysHmX6PJ4DQCRNF7yOGwt+zsbDUQQlnWobvSueVdZgdth30MnRDfrVjSTy3k1ld9HK6B/SKvEIU/Hzl4O/14r1xypo5WV/jYnOFdU= 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 17503391121571005.4814535900601; Thu, 19 Jun 2025 06:18:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6n-0005YP-58; Thu, 19 Jun 2025 09:15:13 -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 1uSF6c-0004rp-7y for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:02 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6a-000474-J4 for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:01 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so9424455e9.1 for ; Thu, 19 Jun 2025 06:14:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568a6078csm19176121f8f.21.2025.06.19.06.14.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338897; x=1750943697; 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=y5LZcCqNpH4GazYoT4HEePjvcf7hcAUKrr97H91/oS0=; b=QosOga39clcQoPlNDz92XrkRfYUQXQx8Dcexm3Os4ANQ2W4C43xys7BPlUoW4vuhKB vzEpELRDD7ASdj3eG/ntKJ9rjgF4q8nxfN8IZdAiObzE+rqA5apawjgyQTwul7rP6mGr Hh/Xsk6lzFEdjap7djOhHAsMUzNu5ZgRakGVdi640o8scxEdlXYzyqROKFsxuJ8czJlA cmvN+CLTTUwphHlOcG4xW0PRJSmynedIL3/93+frCco+cUc0lsappsX0agK21FkTOGaz 76cyF9fIyR1vCoXxOXRE2k3veU3/vms0BHKLSATb1KGcUFeHh5ApnBvyw1GeJlIAUmyR c+/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338897; x=1750943697; 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=y5LZcCqNpH4GazYoT4HEePjvcf7hcAUKrr97H91/oS0=; b=eSx1kvdyNp80qvcd/6Fvh61HnTxipUgtqTOym8dVQkbGRhkAf9nwaWGc3Sn8XMT6dq UZo93NzMyMvn4QtBcDbdgofuUTPRCIGJ6+XlcJ8vbKVILgE17HFQdeLaceRejrkTBPU4 rzLpn/Uvf1WSL27K3UnFG70nQsByd1CFLFX/Y+FLsEeUi6FBF/8Lcz0PaS+wJTbq1Qg6 lyaWFX0kRmHfmcMUkBoyFvtLlyk5JMHZzHyHLcEKRqQM54x9ODEtd/tURXTSkqzlmOlq nRdHAil+4NsWfRt2gDb1IaJ+dR82XGnXoGUxw8cgSKZaH3xawBbiDnTRBexOyT5KzgJx zing== X-Gm-Message-State: AOJu0YyUpo3NNokmRfd8q1FolPYl1IRCZhFg5MERN2K4j5LoCSrOppBk /8Igypn7nZtQ9K+XY0/5wKB3C0IxZqms7mdM9ya/ioVtgFgWNf1u6R5Kr3rjeMeZWoIUPbUwt0X 3d4Wa3PA= X-Gm-Gg: ASbGncsYv9rdnSO0VZUudEZEltMcTIAC4LCnXWKAslXMi95BawcDFyG2EHZdUNMufuv IH8bxVR+ljaefJE6FixqssKga92OpWv+btqXwSLIkuRGYKjBMJw8XHTnTxyljaNSsbko7LqciVP A6ab9tB4iCRHxqczDNduDChI32JQHWgxvz5gvJ466pZMB+FHuFurZ9xq2G0az+Dgjhla2DZKXtx Fy1ikRPSml0ah7J0d7TsAwPPkt5uH8pE03C8a3zY9bS4RIhULfmXJIOa1JYj42KS0ePOcExPzpJ O2Ln8G0n/DXsR4MbQWAFwc762iCycZ7uQ/7bgvTp3Ko+pB35/kXO7pyCZ9wttCtFVr35noJgwzf ch0bjmcyY1D3b4Z7G5CrUwqWf4rrwp7ihVXIR X-Google-Smtp-Source: AGHT+IGSPxsi1o1FNjNRdOKa4gLP4CvK5BiNLtp11Lll7xjWxOONtOoutqWpAjesn+xGjJ2lNdFzIQ== X-Received: by 2002:a05:6000:65b:b0:3a5:88cf:479e with SMTP id ffacd0b85a97d-3a588cf4d3cmr9235335f8f.48.1750338897594; Thu, 19 Jun 2025 06:14:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 18/20] hw/arm/virt: Rename cpu_post_init() -> post_cpus_gic_realized() Date: Thu, 19 Jun 2025 15:13:17 +0200 Message-ID: <20250619131319.47301-19-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750339112950116600 QDev uses _post_init() during instance creation, before being realized. Since here both vCPUs and GIC are REALIZED, rename as virt_post_cpus_gic_realized() for clarity. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a9099570faa..da453768cce 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2032,7 +2032,8 @@ static void finalize_gic_version(VirtMachineState *vm= s) * virt_cpu_post_init() must be called after the CPUs have * been realized and the GIC has been created. */ -static void virt_cpu_post_init(VirtMachineState *vms, MemoryRegion *sysmem) +static void virt_post_cpus_gic_realized(VirtMachineState *vms, + MemoryRegion *sysmem) { int max_cpus =3D MACHINE(vms)->smp.max_cpus; bool aarch64, pmu, steal_time; @@ -2349,7 +2350,7 @@ static void machvirt_init(MachineState *machine) =20 create_gic(vms, sysmem); =20 - virt_cpu_post_init(vms, sysmem); + virt_post_cpus_gic_realized(vms, sysmem); =20 fdt_add_pmu_nodes(vms); =20 --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339211; cv=none; d=zohomail.com; s=zohoarc; b=asxpI3jLB1GAyCl+4v8HtjdxJ0tyF4Y7BLDaXx8oR9HsOVD5jIh6n3xIVv2lxtKnDX7qDX0GKTMxpF+Jbka67sKwvOS+P+ppbWVkEo+bozxAda3sxzOE45tU+r/0EWGyGqV5r1kT69mivvjdvaCtA2ion5jb3hoO6ZKlkkVmAGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339211; h=Content-Type: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=ZOrY1FO5kcbv6yzuU6OsNlHS46/lwsOolLM8hoDx0Ks=; b=CXNqWnh6kO2VC+itJOWELeDZ5c+p+6mi30B6KYxwFo+TtI4PzCL7ob+AtOCDiKMlHFIALtVja5vdEd0kjke8cGtdQTKTQbL3wfYlx3u8iSMCCemWbkMOi1ZpvNnPQR08ThsXS7UXVF6oz9nkY1CacueVucWpOEW+xHQRMZIQ+H4= 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 1750339211409472.6423160549342; Thu, 19 Jun 2025 06:20:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6r-00065N-MQ; Thu, 19 Jun 2025 09:15:17 -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 1uSF6h-00056c-AB for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:07 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6e-0004E1-QF for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-442fda876a6so6683755e9.0 for ; Thu, 19 Jun 2025 06:15:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535eac8bb6sm28841155e9.25.2025.06.19.06.15.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338903; x=1750943703; 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=ZOrY1FO5kcbv6yzuU6OsNlHS46/lwsOolLM8hoDx0Ks=; b=iN17VTZZoDmSEWfiUkxKk6tWVMWphdhNTttC7Ru1M2Bmb+ln+RnEytJI0+baLtC2PW d0BZtxwBb/xpbr1MwnoK295dtgQV4mwEIZksFxGYdO511NtOfKM/1y6/j6TW8boGEyB9 xOmvLSSoloL9NtJdjK5ECL9XzFjJhCtGeK8zpI5OIpN2RU4gPhu/fv1XWKfmLZg/tabj Jtja/Hq4UyWc3UxaR2qzNWUpTjH03/miLPKmG/Km0Spcn/uYuB2BbEPF+1F4y3hY2qmN YmI6BJG65EHpOmuhO9qyanbdnpsxAU3Twx54jyMNx0uwwnkVe56a8EWhKFe92+CHBph0 5zUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338903; x=1750943703; 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=ZOrY1FO5kcbv6yzuU6OsNlHS46/lwsOolLM8hoDx0Ks=; b=aEvSwpJMd4n4u7K01dLuavq37VZ1zsLOvPCq2aPW/QnhV37xuoFKzcqzEe5zncISqe Jn9cmx2AYX93W8q1VH4GAsCZ6BrJx6GZQwKUoWK6mx66kWbdZAmA33Io+gVDZvpN2E2O wZqgZdDKXLI8PIfqmW6YS9Cw65v7ck1U3ObNtwU6ceJZ4wR/Eaesxjc2A+LoXJyd4tPq Ep2fqmpwZ+OWO93RvsFCIjMA89fLFpxy8453fmv1ZO1hPdshWuU43i/U77quqcvJpyKl m4dVNNU6MJEYcJDBNP8ABxD+fbxpplQjk96rK6bajV49U+zEtSSUe3t62Xlg8SxGBdhy 2m5w== X-Gm-Message-State: AOJu0YymEoaCjpcRF24/T+TYWrYd5nX+WiHTkjPMRJAF2DbYcaIdstNA dkFyaGYnYcv/CvuohWMrWIdSUxfUMX2hrc0CW+ZEn9klB76/o/95UC3xpUsKhSw+h7R6ghFoBmO rZFqeAts= X-Gm-Gg: ASbGncsiu8P935Ijkl8toESiT4uPp5JQl10UuCsZ09Vsmt21y9tsBi2md3pKHYttgCk xhxMVQWfwUOgXXIM5XwbHFYFcvemGSz1tp4HHF1juz2dBSQAhPNtddZn0b0TSUYVPqSL7eB1VEj 4M2KfNfyLhGIZGN07XND2xH/dE3ZJMT3t5s4s3zPucri6rQoaEeJ9wnEFGUbeaztskbtXUM8+KT EPMOtCMkzaTJ6Jyyla5h7uOfSwwRAgOgzX4dTd8P1+Vj1F5MN2bq0z3tL8jgdPLTbZP+ZigqdgE T/iX9zYOWTTsM30M+szeun8i/w2ngs2wC82SULNWbdYW2GT8kuZwmnIWvNnDkvx+5w8M+9o7Ntm eMRCmksiu7wbsdc9fuU4d4se/s8UDS8YFSKtd X-Google-Smtp-Source: AGHT+IFFj/4N5XELq/kLhF7E4qci2bJJhqg8HElhpm3KcUTcYoBlJ+rjYJOiQKm4H1fVjPvPjGO1Uw== X-Received: by 2002:a05:600c:a01:b0:453:6150:de41 with SMTP id 5b1f17b1804b1-4536150e073mr16395235e9.17.1750338902687; Thu, 19 Jun 2025 06:15:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 19/20] hw/arm/sbsa-ref: Tidy up use of RAMLIMIT_GB definition Date: Thu, 19 Jun 2025 15:13:18 +0200 Message-ID: <20250619131319.47301-20-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750339212092116600 Define RAMLIMIT_BYTES using the TiB definition and display the error parsed with size_to_str(): $ qemu-system-aarch64-unsigned -M sbsa-ref -m 9T qemu-system-aarch64-unsigned: sbsa-ref: cannot model more than 8 TiB of R= AM Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Leif Lindholm --- hw/arm/sbsa-ref.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index deae5cf9861..3b7d4e7bf1d 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu/datadir.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -53,8 +54,7 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 -#define RAMLIMIT_GB 8192 -#define RAMLIMIT_BYTES (RAMLIMIT_GB * GiB) +#define RAMLIMIT_BYTES (8 * TiB) =20 #define NUM_IRQS 256 #define NUM_SMMU_IRQS 4 @@ -756,7 +756,9 @@ static void sbsa_ref_init(MachineState *machine) sms->smp_cpus =3D smp_cpus; =20 if (machine->ram_size > sbsa_ref_memmap[SBSA_MEM].size) { - error_report("sbsa-ref: cannot model more than %dGB RAM", RAMLIMIT= _GB); + g_autofree char *size_str =3D size_to_str(RAMLIMIT_BYTES); + + error_report("sbsa-ref: cannot model more than %s of RAM", size_st= r); exit(1); } =20 --=20 2.49.0 From nobody Sat Nov 15 14:11:24 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750339218; cv=none; d=zohomail.com; s=zohoarc; b=HVcODryLqJE4H7rc+Xn/BuX/uh3uLUaR5sOQ1iZAz5MxK/wm/0onQ5WXx2y281B6a/5yceaeZBqw1W4xk2QGsyLLOqia26FCJnHKkGlAsBorHPMbu0ML7M1TwPWl03hxAzmaJBdXXAmz8KqUaLSplqM8LOidtrotW1CsGaH1HS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750339218; h=Content-Type: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=yfbZh25j/JWcO06w+c80OaMwV9tGFnS1KSANu6xFbyE=; b=X3xRQ7rwQra8vOyS0Bto9hLznLO/tk5gR19+rtL7reEsPs4VYkiuWIexo/crRuyy6sTD7FCbJbFkch9w24Qtbb4yxMdcwTR4+Rpgklc7VRC/NpCltXZ6ar2cFleXnxOFMCmyQwlNTMblzESyxkJZqsOiBVi4KLF0l5mct1s+9O4= 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 1750339218611724.6895942276723; Thu, 19 Jun 2025 06:20:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSF6u-0006Mp-Gq; Thu, 19 Jun 2025 09:15:20 -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 1uSF6m-0005Re-1o for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:12 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSF6k-0004Kv-3l for qemu-devel@nongnu.org; Thu, 19 Jun 2025 09:15:11 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-453426170b6so11665635e9.1 for ; Thu, 19 Jun 2025 06:15:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b2f80asm19552864f8f.78.2025.06.19.06.15.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jun 2025 06:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750338908; x=1750943708; 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=yfbZh25j/JWcO06w+c80OaMwV9tGFnS1KSANu6xFbyE=; b=jzPjDWpj81RuWVYolYhuqpW7YwtCEiNw1hNEgp7QNgq6eQIG5cq9opLc9Lcj82WONJ oF5Sv6/27lKl90oC7+7dF7B5TAdR39hUIIKbsMjk3JfhDwZmvkG70jj2XdMPdXj3e/DD H1+fN12NMVyI/GRx0amm/irCWy0VspTdyTiefvyfeQK0oZwvQu2MilpCVu9fVZ2/nnHh Tjo+WA780JveA7jOlvoiHxfXdHzISM3RmDQnITrrRrif0Vs4XMGi9JI745blAjlJLDze bV/xCBMfD5j9pH2h9nSm32BuoVt8OEZzXrjpdQ+laWO5KEaJ5XPUK/iZqpsOeBQflS+V 5UWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750338908; x=1750943708; 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=yfbZh25j/JWcO06w+c80OaMwV9tGFnS1KSANu6xFbyE=; b=c3hA1ykakaseDsyqm18qkfhYU93XOJG49bjrTUiB9V8tL5aYNjQb+LVNWeezIhIlpP dWX5CZTxQ1mnerp/8LJNz83D28Sy7y9UiYUsw3h/9ub/c9guQHnj6Cd7uGyRuM2cMyZi 7IxVypstHtzywbwEkrxDKSKBU7jEE8DQA+HAO6mVL1Z+wMevhmSjNDfrdbR0kOtAfTj+ Seizb19RMuVW2A2Qp6K3WJ9Z6pXoB8IPSrOv6SaiL56AJD15341/2gh0hAEmrGJv3+A+ qhyQ2tVImbl0r+fyder31h3bEyhYTET6ha02wv+CXSgoAKQiTT622QZmYGzzJbUxBFf/ CXig== X-Gm-Message-State: AOJu0YzzuJB4K0jnu/yfRG5pkmW/g16EoVlC8OFXbEaqn+ChQO2K69n4 k7Kd8QO8U7N+vJoWWu2kU3Czf/LM3xOCFyWrprSm8grmX4ILogiyaDIilR0RLGmEniZVLG0QQrI YJe2RkAM= X-Gm-Gg: ASbGnctPgM+2hptPleak3SmVKS+byTHeaA2pW/giCqgRLDZJ7+HIugswItpxEbPFHlO A0rRIiQ66/s66XbbzH4XF1RlcQ1GZ7cof1vf/PBt+ZbBrT+PN5PQmuS6a1LEFlbPobkwq6IajTY o7KLuro/t6tF77wGiV1nwNMzsiUyKKVA0D/T2ubW/y1tziwaMn8/ZxeL9H+cE2qBo4bNe0YC7Ph XBYaTB5XMMRCV+gQyI/WWpZnTuzlNfFTvSvOK2dCQxWNrJLu7VT+o2hPbY2e/sqy07MIDEt3EKo 2ZD9pMeQY2+UwdihVNBmaAWc8lkkl35RBuJrEganjkvIckLR4qh/H8n3CJvQuWlmYXuYw0HLwR+ A/0Qzwi/+mvbSXZ5INEGpBMrog20crtFFx8Lr X-Google-Smtp-Source: AGHT+IFW6hA3yAKdFTUe8EEI5kic43ZIITMi78xKgEZunkyJSkx0t16xPuunedGwf+ZaxjadES0vkQ== X-Received: by 2002:a05:6000:648:b0:3a4:dfbe:2b14 with SMTP id ffacd0b85a97d-3a6c96c102bmr2506122f8f.16.1750338907890; Thu, 19 Jun 2025 06:15:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Julian Armistead , Radoslaw Biernacki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Peter Maydell , Leif Lindholm , Pierrick Bouvier , Richard Henderson , qemu-arm@nongnu.org, Roman Bolshakov , Alexander Graf Subject: [PATCH 20/20] tests/functional/sbsa-ref: Move where machine type is set Date: Thu, 19 Jun 2025 15:13:19 +0200 Message-ID: <20250619131319.47301-21-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619131319.47301-1-philmd@linaro.org> References: <20250619131319.47301-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1750339220423116600 fetch_firmware() is only about fetching firmware. Set the machine type in test_sbsaref_edk2_firmware(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Leif Lindholm --- tests/functional/test_aarch64_sbsaref.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/te= st_aarch64_sbsaref.py index e6a55aecfac..5536ec622e6 100755 --- a/tests/functional/test_aarch64_sbsaref.py +++ b/tests/functional/test_aarch64_sbsaref.py @@ -40,7 +40,6 @@ def fetch_firmware(test): with open(path, "ab+") as fd: fd.truncate(256 << 20) # Expand volumes to 256MiB =20 - test.set_machine('sbsa-ref') test.vm.set_console() test.vm.add_args( "-drive", f"if=3Dpflash,file=3D{fs0_path},format=3Draw", @@ -70,6 +69,7 @@ def test_sbsaref_edk2_firmware(self): =20 fetch_firmware(self) =20 + self.set_machine('sbsa-ref') self.vm.add_args('-cpu', 'cortex-a57') self.vm.launch() =20 --=20 2.49.0