From patchwork Tue Apr 29 04:59:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885703 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp142979wrq; Mon, 28 Apr 2025 22:01:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9RoFaqqdi96CxDIbv3xerfTiitUbVhC9+2vTfCsN7JfWKrd72fO8MRDx3aA7kZCX7f6+Nag==@linaro.org X-Google-Smtp-Source: AGHT+IGySukXTlrzwKW905odWws0wsapFDLBIQhgp2rmVDqnL8vUAnKqi9eU+LTDleIV26xVVoXq X-Received: by 2002:a05:620a:2784:b0:7c5:5f08:3c5c with SMTP id af79cd13be357-7cabe73fcf2mr250495585a.3.1745902886229; Mon, 28 Apr 2025 22:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902886; cv=none; d=google.com; s=arc-20240605; b=dovbD7D2bUDlPXmGwYg5XGlR/47ig9N6f9WuiOVHIJqZD0k8d1UADcgUSK6Z2/H1/8 4XafGNUtTixPrF0Jsiivs1Ls06Fvu71t/SC83yxnucTDUwyb01NsV3ISzpe9Z6PrII48 LLOZvWIoWgKbdzHuh6/wu4JiyGMGqjDN7jyRJ3lKl9/e+ngWJoEHji6deR1ILt5CgxFM C2NvFR8LPmhFLejH42DyeDiuAxIdZ/rtib4mEhYdYxqosercgHNRvkJLjZb9WnSORN7r sJznhii3BL4SaHPMFFVshIACo6luWgtxFCvT/I9skg3oSXeRTt6E3BxD9ALAW4Dbnpqp k1Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qd9JoYIvLQe/drBoM2Bi9/5cgLzZGHsmbjtG6PaToKY=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=eQ6FeLmfTG0p9l+SWPQJzet2l40ZSlpIz8zsjPz/szfBCKDCmjN+B5PY57+tTCrSxt zeL4tk3GWRSsXA5CkOHjRRaq6JHSpbUYVhuG1QR//dLaf3SQ1NwpnWhBXoZqNADL7RPK cTg4qCZtQvNgihQIUHNLUq9j4LaKHC7+u9XPIBHlwW6D6OjDP40VxpThNTfcJTDi6BZU UKHFhPi1PsPWXfA542f6EBUk9Y873ufaf65RtamSo6cYAzJjS2vP6nbxwZ+g6POYDOKs AitBFXQiLO34V0OrWgEZGRVTTb2HTpRpKFFhJBrMuL8U/WIDSM1TZD8Ov7Cf8mwC13zi rqSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ts3Mg5xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958eb8b44si1098755685a.527.2025.04.28.22.01.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:01:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ts3Mg5xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5E-00080g-9F; Tue, 29 Apr 2025 01:00:40 -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 1u9d4w-0007X8-OR for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:23 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4t-0005yL-8U for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:21 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22da3b26532so48156015ad.0 for ; Mon, 28 Apr 2025 22:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902817; x=1746507617; 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=qd9JoYIvLQe/drBoM2Bi9/5cgLzZGHsmbjtG6PaToKY=; b=ts3Mg5xy10CFwIodrwP2DTDjbMQqc2sM8FrsDg3IRbHw3kPxp6qhUOd9vBjiyHScRb Roji1b/mvbCtLt+F2qbDXNczZw6Oi4ATtEv0bfQU9yaNSXX/OPNQLrUwB24MR3ii9WS4 40/p8LhSUe8hc5mtwh2JJpnuFkzMqSZ47s6exq3XAlr/ovEl/gtCS/BOihJ618x+pmev SB2EFxiOIe8a4fLGT/JR4QGIl6EzayCtiiO/H6ZfVQKYSOCiKkYagoy/4SdcDtPS+Enb p3PTaM6hdU0M+76U2idpAOLJ1UyR9lqC4vHUm6rNmgJXsSo2ExBqvC/rnWU/gpKfhTuz d3IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902817; x=1746507617; 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=qd9JoYIvLQe/drBoM2Bi9/5cgLzZGHsmbjtG6PaToKY=; b=bPQx2joYnmooUPi1nfoSE9fBU6YaD3A8tLMX+zn/MEUS1/Sw2yilbId1T0QxVC7t1l r1kIHE46LPuZbBsFZCewroPGhi1rPvCNizgfD5fEW5ZByspB2IrnVJbRGfQzsAJTq5RT rtad7XIPQmBvbl83O2x1823DNVUqMVgiyyxuOU0k8X6ZYHnUcvmW/xB7fCZVWLXXtADK zhzPZ1E5pRKI4PxXy0uBXTNCoVb91n9GQTDBAbTMzCnbARiHVpJRQeJz8jxFbzpyBq/F ewP9vqNO9IFODd+qM4fVJ1OdO22rzUPUkHQ2HCVM97GCGCIRKeYnSQpMygdy190V/FAT Il6w== X-Gm-Message-State: AOJu0YzR7x5ovc2J9qOcRA5Hrpa7K/3KPu0LlNJ1c1s4NYMnkt+royBI qqQfpFLAM74sbQt4Qx0F2nJS/KrHEAZeVx5TiBk9a7qXbs963oVWUAAZZ/EDPgHGT8ljEh/xplm C X-Gm-Gg: ASbGncvEql4cgED7Mqs9++ejsW/muWQw7NtOoUz+zn2Gk9b/MeDHqk3DtisN7Q6RBvH KHKr1YailT8tYqH+vEwyCUkzLBUdGHg16yo6mPvWxfnywYjcbG8rvor4CQM7Jy9Y3K3s0wv2tOA SnPyQrC93C9nBeSN4nlUY+umdRbKLKOobn0s5Fi2iKMDLcMMW92ZVDH9dYanYpj6aKcRoHjLjKv 47MbZxO1jgG/3ZP2j/uTdYn3IH+RCsQ0U9L84nPm62GfvzzF4iWoI/ebNp7tN54wuPnhGydUJ4p svX9R+YsMQ0HTBARV0qNso0om21v87FFuUg0Q/qn X-Received: by 2002:a17:903:28d:b0:223:f408:c3cf with SMTP id d9443c01a7336-22de70276d4mr26404235ad.21.1745902817405; Mon, 28 Apr 2025 22:00:17 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:16 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 01/13] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint Date: Mon, 28 Apr 2025 21:59:58 -0700 Message-ID: <20250429050010.971128-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé CPUARMState::pc is of type uint64_t. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Reviewed-by: Alex Bennée --- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 4d3d84ffebd..c30689c9fcd 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1949,9 +1949,9 @@ extern GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc); -int insert_hw_breakpoint(target_ulong pc); -int delete_hw_breakpoint(target_ulong pc); +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); +int insert_hw_breakpoint(uint64_t pc); +int delete_hw_breakpoint(uint64_t pc); bool check_watchpoint_in_range(int i, vaddr addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 0512d67f8cf..4d8fd933868 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -54,7 +54,7 @@ GArray *hw_breakpoints, *hw_watchpoints; * here so future PC comparisons will work properly. */ -int insert_hw_breakpoint(target_ulong addr) +int insert_hw_breakpoint(uint64_t addr) { HWBreakpoint brk = { .bcr = 0x1, /* BCR E=1, enable */ @@ -80,7 +80,7 @@ int insert_hw_breakpoint(target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_breakpoint(target_ulong pc) +int delete_hw_breakpoint(uint64_t pc) { int i; for (i = 0; i < hw_breakpoints->len; i++) { @@ -226,7 +226,7 @@ int delete_hw_watchpoint(vaddr addr, vaddr len, int type) return -ENOENT; } -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc) +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) { int i; From patchwork Tue Apr 29 04:59:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885702 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp142978wrq; Mon, 28 Apr 2025 22:01:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkJTJUvsBJ0S47zNWPrUYlCV6U21SlSgkoCbDpkVoMlxhsjtkLk2eDuebUWzu3PUFS+eVKLA==@linaro.org X-Google-Smtp-Source: AGHT+IHqFk2W/SK0+sgnKv79//vwzQP3HATJiof8rIAloCVtJhpXX1gQ5kLrrGIfXG2Oj4FIBPj0 X-Received: by 2002:a05:620a:4107:b0:7c7:a524:9fe9 with SMTP id af79cd13be357-7c96687c72amr1607622085a.27.1745902886226; Mon, 28 Apr 2025 22:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902886; cv=none; d=google.com; s=arc-20240605; b=TnKEdNzvODlMyoIYQTx1ZmCATPY1uBoNGmEacos4Gcs4s2MDAxoab72R/1ljlZqhEo ukbarEmKKCQ3TUc1m2VjR+Qu7Cduyzu3FPscjy0b4so8vafFErTccArB7PMvziLgj+9q neccyUgLl1HDku4rGHODk4YemyK2TdQZs+6v6X9GggrSYOzgiUyDx2GVG9oWim4riZml hEvll3K2TeUJLME7BKWf5c5YJk1SXUv6Lik5EYi4I0QDacbQRMubUEpxNxEVKI4WN8LK yyrGv8PXPbQDOWGNiYI+cF4D2lFIav0Y5I0gZEVb9wEyMN2/iiCSWm+vUGl9g+QjLqM9 i46w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J1+mpgNwQQblB514w6gW7TOdOsjY6yGJh5E66/u+eSU=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=ABg95NlZKnxg/qKc/vk3KYH/1XXQrrxO5k+zaHW9NnuFnPM4hq7tbuCyYs5H7pb5T7 x7xQ2dU5XtPXJ3JCUGnjfs+mKxf/go5/Jjvkrw3a6ZIiLuQAfCJkXdvZ9garWT5kNcjA RTeSdt9xtMiEIUALteF/Mgf3b8/QqZ3oHw+f4xrKg9kkj1ctN/Tf2FUr4e4XMsMCssnE w+osPCu6CaWEsEHyijsV2QxR9bpya/3WTFc+2lhh9W9Rjhzm+GhUZxb8J7Gb6xBx9u2N rOPERjbN+cRTTdAjrdwj1i0rbWdHDgynt/X12gy7ft8D32E5diJh1MJBhLJHJEjEGrfO 3xOw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pncYCfXl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958d85fc9si1095047085a.244.2025.04.28.22.01.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:01:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pncYCfXl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5L-00081U-B2; Tue, 29 Apr 2025 01:00: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 1u9d4w-0007Wx-M9 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:23 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4t-0005yV-Nt for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:21 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2279915e06eso62680865ad.1 for ; Mon, 28 Apr 2025 22:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902818; x=1746507618; 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=J1+mpgNwQQblB514w6gW7TOdOsjY6yGJh5E66/u+eSU=; b=pncYCfXlRLAwDiIcQYTGtm7L5DlaZwUOlrsIEVty0QqHFgkoWQFZGuvp8h6AnQN9Mc +JAp8+3ExTvWsbXlUT/adPAgNTVkhRRTyg0u2unBCVFXnDkQj+A3+KddSbS/ImL6cs8A 81VjqtnRfouLp1U56xc2oNq2fGYOVD4DJoVXoYc6PLwrcSpei1riMS/4yrAw0OWFtJxj 8EZ1OmSXWHRFHLbXe+ljLZzYtfuw5rfpGy98dktYu+i0zb10jP8PwjwOuIaxKFD+tMzw gVEy1uNdmh5YPoYL4cAYIcW8T4oc7WV9jZHs0ZsepRxU4FiHCEE8lje32kPcVZZkKEPG L4BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902818; x=1746507618; 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=J1+mpgNwQQblB514w6gW7TOdOsjY6yGJh5E66/u+eSU=; b=sLSojl3m2c3Wtwc72TTpFxieyehvg+5J/VauYsXIEDEDomeXabNAh2+xWqRPamOB9W LHnxrut4WHw/FWp+T1OuaE86JYCv4ND3JXYrmy1dAiVX8p91QfUq7JSpXZpjShfIFbiJ nZEOgiHiXp/x+1z7Nt2ADp9vnBvngFo/rdAocdjQ72jf4V8aWUkkklOJ4pVXbJ/Ro8VA W92pGXs+CS05OzlTRn+B9Mj8u479jvYY59nxk5FBNS3m/grJp73rPO0PWI++b19LzUrq svJXa6RDH3vS+3jmSoMh/mlCA2VZKQl2hpEtV5D4ZKEcF8iWk+hiWYNIPYbfaipxR0F+ 0Q4Q== X-Gm-Message-State: AOJu0Yz4zBEznSvjaQp7K/KNbPQMM9h5+MTEQ7FpnZXJ8inCQ1UFeQWF mtvxPmblk8fnOU4cde0YrZTlWSNZWq6Dz+orVu/ubGACICowzgIGyrkOwonbMCKuJ0+d3F9zfXi k X-Gm-Gg: ASbGnctyVzx/JguT3v4dE0ZZ0+MvjSTTVqmQr0bPwf1khGP6Kz5A9l0XPlgUWniyNIr x2UPX74i88ZmXh7HRda3qP1/5mDIH7US9ma3eq4BmuocQr+BMTOex5jTX2kFyw2kCZ9Hh7O8iXX mPhD1dDghG36UZTulKi8ewYa3W0Hjotm1uuLGkMfpMLmfhc0TG0BkYjLyMQWByBFN99ZotrRBrY lKQcWE8R+pVu0NO2F/u3EWNE9GAfo3tTO5rowSbn9SuAAvROCT8ueDVX+6IIfJOia+rvu4j2k3m T/6IzfbYKbglTAxWVE1FmD8m/pvKaJSP0Xap8hb3 X-Received: by 2002:a17:902:d4d1:b0:224:76f:9e59 with SMTP id d9443c01a7336-22dc69f3b0fmr169007685ad.10.1745902818246; Mon, 28 Apr 2025 22:00:18 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 02/13] include/system/hvf: missing vaddr include Date: Mon, 28 Apr 2025 21:59:59 -0700 Message-ID: <20250429050010.971128-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org On MacOS x86_64: In file included from ../target/i386/hvf/x86_task.c:13: /Users/runner/work/qemu/qemu/include/system/hvf.h:42:5: error: unknown type name 'vaddr' vaddr pc; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:43:5: error: unknown type name 'vaddr' vaddr saved_insn; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:5: error: type name requires a specifier or qualifier QTAILQ_ENTRY(hvf_sw_breakpoint) entry; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:18: error: a parameter list without types is only allowed in a function definition QTAILQ_ENTRY(hvf_sw_breakpoint) entry; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:36: error: expected ';' at end of declaration list QTAILQ_ENTRY(hvf_sw_breakpoint) entry; Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- include/system/hvf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/system/hvf.h b/include/system/hvf.h index 730f927f034..356fced63e3 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -15,6 +15,7 @@ #include "qemu/accel.h" #include "qom/object.h" +#include "exec/vaddr.h" #ifdef COMPILING_PER_TARGET #include "cpu.h" From patchwork Tue Apr 29 05:00:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885714 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp144061wrq; Mon, 28 Apr 2025 22:04:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3q1D1BMnB0BCa1sJMWfr7C2Ll18riLBY8QOwlYgwR1oVCoTaAnY2NuiXhDt7I65F4NMj2sQ==@linaro.org X-Google-Smtp-Source: AGHT+IHikS1KE1NIJ4BtzfFGP/gGi9zeRVomP8M4YX2OXD89xKLURnB4tJSzmgnK0PxMN04bWK+S X-Received: by 2002:a05:620a:2a0b:b0:7c5:65ab:5001 with SMTP id af79cd13be357-7cabddaf233mr299807485a.39.1745903064761; Mon, 28 Apr 2025 22:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745903064; cv=none; d=google.com; s=arc-20240605; b=iwGtS81GG8odXD28VmrjxF+eTRhwvuenWaX1Ls4l5Bg6uo7pjghdhsdLezdMnx2WIB KCsB6rcn0ixaSpDgBiInOC2pNTeM2yp4br6Q86BopKv0VfetF4DSacpuAb+twgOcTY6+ 6kMNvwI4n3ucAnWE1HOjpfWmR0VLw9hSBnJ2IqBE9Y+6tUZKrX/AfzT6KOACbIc1Qahq MWL6gX0p4vpZKTF+61xCHYrzjEDKTAlEog9u2Zmn9NQC5ANOSubLk0B9Az8h0uVFs+/R JvlWVjkRCzzb4ofHAzqBZ5ErrCmj7F+kTSR6N6j6ajNmD+KRPvE7zPRmn4TFXFYL/Z0K PWBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8aXdmB6f6CJf71wSR2HMNjOPhUhdvY7cV28foawZJTI=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=Zpw5+aiUFlS2LonaxYkPtFc3+0wYD2ZG1hgXgidWfjrj2MWpCXPXpXJSps1rJBW4lX tGZZGnSQ9n3lvRnWQ/v8ci4Fi06kS7HHDja1l1pOe/u8PQG1UqoQxZPGWHxeT55WdMPZ kRS5flXORoy04JCaHEKlCWD+bGMRW7KWpQZS/tqCw/R3Uc8V+aU89pU/pLRgNz9OaSbC Na+EerctvvlyvSJHELs5rJCkmMk8lqYcrdnU4d98wIexjDRpHWoMySF++zC+iTRv0eW4 u3lJbagFGAmVjSmHck1ROetRk2XBpPUuGhTp2MY/cNGm7C9SgmN5BkHWwUZzGvI04PVi DFSg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pGdyrq50; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958ebf669si1135211285a.582.2025.04.28.22.04.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:04:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pGdyrq50; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5V-0008GN-BO; Tue, 29 Apr 2025 01:00:57 -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 1u9d4y-0007YT-A4 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:24 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4u-0005yh-NZ for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:23 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2254e0b4b79so83235965ad.2 for ; Mon, 28 Apr 2025 22:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902819; x=1746507619; 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=8aXdmB6f6CJf71wSR2HMNjOPhUhdvY7cV28foawZJTI=; b=pGdyrq50SHI3RLHGUFTJcmvGAlIO+wecQZJEOOY11FC7+pex9zdvqdQ4mEttice7+N 8ovxiQn33IB9F97iM19UMt77Og7llW5/gDHr17wrJhcop/8UOP/FiCox11C15vt8nVYX v9PWQf635qpVXNCq0zZoNLmD83XCHhOtNkro2SAvx+qm80WCTjTxFY/9hiVpz30Qg5lb goqvTfAwK23Enu/0TvkTM0t6uQnPiaUXIWugBjZi9hIeftlEcRLc1hVVYvOoHlNXHFH2 zJgkObOROwdhSKDrcN+Ej6eFarvYm0+PVPCAhQTRJseahKJzqCj2Xd6/ILRSG3mkSuaL 7Ybg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902819; x=1746507619; 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=8aXdmB6f6CJf71wSR2HMNjOPhUhdvY7cV28foawZJTI=; b=AW8xnVM5Zwab3sLu1MBT9tiHtmYTbzXDMnL7j1MA0a3wzJRXEepU0MQ2mdDaWVXlee AmTyhmNe62Q7ujTBwksN1YASs7bOMKw9Sdc8YahlhWfb/OSj58fdRfCCNZ4AiCsOunqY vJOA+iPTKY++QvwXN2pkDBogUllULuXgv0o8WSkmexnMJbp22c+bnBskyka3mUlocSmH oONIiolmSASusp8MdrXnxAY1O7IFsuzx4XzTTK3qjZaSf5Chb2hNHLy51uIqB0nUqLZ5 UYTZvMfrMzxUOOSt5Je7+svnp0jMqmXIwNeVCtJDmItDAjMGjjkQHZYJFxjE8Tp9lhMW dxDw== X-Gm-Message-State: AOJu0YylP4hOEnmeI+El23u1dgRvftCj37ucqMjem9nHSJP2eYZ4bZYi IvegfBWm/H8pQ1p5KeRRWEdGZWBytK0J1vhgv1RCeS9XWsD7XEtdj5btiCXSjp4ped79AE67+EN z X-Gm-Gg: ASbGncvZAslBbsLRJ7MjVOkKr5QHSXvGN6jfoKe7MVJzNIcgC++a4PP8L8GpgPIVm7q CABQP8ViJlsAqgvB/Romr4x0iIuiwrY0I1y02DEf0FpKwbJMEO3lcca4alcE2NT2NSjaYW4BLWb 9BGL/DXEpHIascNLeBo6pnKj1TJ32yRFzOQ3N8WW8Gcp4ZoHJStTirfTGVEFstha/tAahMR5s9T U5rj62s/aCwSTNRy0TwivQX/LmeJVS9zU0OkHKD4qZtje5+U9/YmKOr/JFwosL9PK9x+hkdNkZ4 s58oE6H66vQ5KULQ1BGqQpb8gGU/cSvxSJ6D7Z73 X-Received: by 2002:a17:902:e5c1:b0:223:377f:9795 with SMTP id d9443c01a7336-22de5debd13mr36357395ad.0.1745902819112; Mon, 28 Apr 2025 22:00:19 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 03/13] meson: add common libs for target and target_system Date: Mon, 28 Apr 2025 22:00:00 -0700 Message-ID: <20250429050010.971128-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Following what we did for hw/, we need target specific common libraries for target. We need 2 different libraries: - code common to a base architecture - system code common to a base architecture For user code, it can stay compiled per target for now. Signed-off-by: Pierrick Bouvier --- meson.build | 78 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 68d36ac140f..7b2cf3cd7d1 100644 --- a/meson.build +++ b/meson.build @@ -3684,6 +3684,8 @@ target_arch = {} target_system_arch = {} target_user_arch = {} hw_common_arch = {} +target_common_arch = {} +target_common_system_arch = {} # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. @@ -4087,29 +4089,59 @@ common_all = static_library('common', # construct common libraries per base architecture hw_common_arch_libs = {} +target_common_arch_libs = {} +target_common_system_arch_libs = {} foreach target : target_dirs config_target = config_target_mak[target] target_base_arch = config_target['TARGET_BASE_ARCH'] + target_inc = [include_directories('target' / target_base_arch)] + inc = [common_user_inc + target_inc] - # check if already generated - if target_base_arch in hw_common_arch_libs - continue - endif + # prevent common code to access cpu compile time definition, + # but still allow access to cpu.h + target_c_args = ['-DCPU_DEFS_H'] + target_system_c_args = target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'] if target_base_arch in hw_common_arch - target_inc = [include_directories('target' / target_base_arch)] - src = hw_common_arch[target_base_arch] - lib = static_library( - 'hw_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: common_user_inc + target_inc, - implicit_include_directories: false, - # prevent common code to access cpu compile time - # definition, but still allow access to cpu.h - c_args: ['-DCPU_DEFS_H', '-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'], - dependencies: src.all_dependencies()) - hw_common_arch_libs += {target_base_arch: lib} + if target_base_arch not in hw_common_arch_libs + src = hw_common_arch[target_base_arch] + lib = static_library( + 'hw_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies()) + hw_common_arch_libs += {target_base_arch: lib} + endif + endif + + if target_base_arch in target_common_arch + if target_base_arch not in target_common_arch_libs + src = target_common_arch[target_base_arch] + lib = static_library( + 'target_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_c_args, + dependencies: src.all_dependencies()) + target_common_arch_libs += {target_base_arch: lib} + endif + endif + + if target_base_arch in target_common_system_arch + if target_base_arch not in target_common_system_arch_libs + src = target_common_system_arch[target_base_arch] + lib = static_library( + 'target_system_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies()) + target_common_system_arch_libs += {target_base_arch: lib} + endif endif endforeach @@ -4282,12 +4314,24 @@ foreach target : target_dirs target_common = common_ss.apply(config_target, strict: false) objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() + if target_base_arch in target_common_arch_libs + src = target_common_arch[target_base_arch].apply(config_target, strict: false) + lib = target_common_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif if target_type == 'system' and target_base_arch in hw_common_arch_libs src = hw_common_arch[target_base_arch].apply(config_target, strict: false) lib = hw_common_arch_libs[target_base_arch] objects += lib.extract_objects(src.sources()) arch_deps += src.dependencies() endif + if target_type == 'system' and target_base_arch in target_common_system_arch_libs + src = target_common_system_arch[target_base_arch].apply(config_target, strict: false) + lib = target_common_system_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif target_specific = specific_ss.apply(config_target, strict: false) arch_srcs += target_specific.sources() From patchwork Tue Apr 29 05:00:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885706 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143277wrq; Mon, 28 Apr 2025 22:02:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWR54hpIAoRsiQCiq3nbbHF7IL3Id2H/HBpDDKvDs1GERmM5PLLdirQ1UWnXuUPqNyQq+V/hw==@linaro.org X-Google-Smtp-Source: AGHT+IF0r88nXOs754MkUZ2DkDw+Od82CmhMrPRpygXX+BUzc6Kz/MDd4hDPnmdimbIIHW0bjx1d X-Received: by 2002:ad4:5ced:0:b0:6ed:e3d:a1b1 with SMTP id 6a1803df08f44-6f4f1ba55a5mr27968856d6.10.1745902928529; Mon, 28 Apr 2025 22:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902928; cv=none; d=google.com; s=arc-20240605; b=Ugdxpzc3u8OKH5Q41QnyyW5jHmcaQV1ZRZMLAgOXXzkpn4fZ1vVKKTK9hyfmtVCovg qgkIXkHALiYxE57AeRFiB6kLwmS3wj7nDKhCCU1kGkm34ewDrkE+cjwA9ulbdHhKI34W MzeA6qnAQjv39y5XyYgjk97XAFBAbLc+WO/YlEkkmdPL/TqioibjE4n5Xn9rd3Q0UpLm JWZWCUUzp5NcrJd0sWp3qwi0+BFouwCkp8q5msnT3XvBfEZ9FfvMfugHKq6A4vgrQlVH Y0ZiiyO89V67ha3NNoWkKWEct808J3x9lZDbcbREePzA3nC2osrrMdHklr7aDBhAI2Nf +A+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OTaFFMYBVP+QujpvomI3smt+CnB1wh0iLnUK0PT4pEc=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=bEnu79++/msQ2RPBEjiRc8ORjWB1wAtt9ylFNKadQmtB13/6R4GTpVE4LxRNdDsMjd 9Aho/8eESAktWL7M2fXWS8RJAdfHjOzrLQ68+xCx4AyF33ExtwCWap734sL6osRbwNxt CM1VwtNqQwbECofg7+Mzlkd3e+AGcJal9tD6blQYwsXVqnU1LchDrNZTPKlT/qhjM59k NKSEbOdk6aDSgLHMZItiQMEcAgnmBGAYTkErb3pLx7oQzFgMjTcbmLFlRgrBK+GBJW66 EEdOz7U1fgvWcSZe3XghtjmSgxtBQLTm82UcSCwcSnvR0SSWgFoToPaF9HqPft3nXQ0H 8d4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gbKgy8zS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea19876eesi123338431cf.266.2025.04.28.22.02.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gbKgy8zS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5a-0008Jk-L4; Tue, 29 Apr 2025 01:01:02 -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 1u9d4y-0007YP-7z for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:24 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4v-0005z7-Cq for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:23 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-227914acd20so55783245ad.1 for ; Mon, 28 Apr 2025 22:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902820; x=1746507620; 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=OTaFFMYBVP+QujpvomI3smt+CnB1wh0iLnUK0PT4pEc=; b=gbKgy8zStpBMUsa6qctQkH3WO9Zpv60GX62dD+TMlCmFXQToSYiS7mdUJjK9l81OCC EpRu21+CjWZC3HC3wac5ecelz/1+vWS57UW9cuvdTJbLIeHgH68W0W4KWZ9IF9Wb2r3x Wl9eEcPOkSEOR1i7KuI7+BDpF8REUycYOcXTL4dCZaxAhMVEBdZeAMPWkJ0PgS6pbbnB lZ7aLYXONyitfu1Y4fSFL8SebVmwsAeWpkvg6yoZaBTeJoC501WGZgcqoiMOzj3dqUCg o1FGGKeRRAobnIqv94B0iDrQUFSmm2rlpT4Z6aD9g4vRZxpqeAnzFk17Ltq9klMGI3z5 6r7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902820; x=1746507620; 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=OTaFFMYBVP+QujpvomI3smt+CnB1wh0iLnUK0PT4pEc=; b=IfjQ/0inKnXi2hYV6kDoF/a1T7qdzMkE3aZbQ/zFPRIpcfI1qIpx/UdUFZsWWv5NEP hygPwHAujiwC7F8JRlfNVpJUVdoOddpZ9AF0TtGvOfUpp6AGPPEXnqLQ6B3GrjZngvo8 dBmh3+4EYA3hDehqtbWAw312rn40fKGzIRq1KpaSRHCMWKftuLXGIn43bWnNrXeRu6Oi 5Wx2Y1VDp0Igi8tevtBt0sovhefo0EZSye6anwt/yYUPvU8kAjcD53/GB93jnKfMvb4A upSJTKgkSDmrZ2Nyu17MDXktq2vmFiJkTsn1RAceKcHmhd3mwh3GxZM1bLhXscELMItX spkA== X-Gm-Message-State: AOJu0YxB6r6fFieY+lHW8C/CPtFe90EVXW+Cakuu27Vip/7eDvYOXXlA udU3Y5+FmE58doDUJznzJIX6LXFZ9dPHVvXdP3QlqHZrstsM5oRV0DJd9KMC809HWO0pPUhLQvF s X-Gm-Gg: ASbGncuSdHZxALuOPw5Vfq69W4hwRBOxpP1XqqlH1TZDvz29L9AKfPm024v1cqRO2m7 Gc0QlL15AUE6P/2e3xA9r/KvcR/Vc1utAqW8RIw4CaFQCoH9rIOcXEU4ryawzG+KLgEQ3g5b6Yu sWY/2mF7kBC3M72jM8oETU3DQK97ToevCASo+VbfFfPEFFX6/pFzlK+2OQ5vgEYnyrSDhlBBnWc tiwzhNbcnhSrRnoiqQTy4xI7mEQz5uhkFQ/V905Lv4BrsqD2ZPJhmoMhEqANOsvN++OBBHxvmEp fuXtlVNWlmsQH612CrY+yghCxV2pFlR51wL6kdGM X-Received: by 2002:a17:902:d488:b0:215:a56f:1e50 with SMTP id d9443c01a7336-22de6bff536mr25643515ad.8.1745902819983; Mon, 28 Apr 2025 22:00:19 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 04/13] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Date: Mon, 28 Apr 2025 22:00:01 -0700 Message-ID: <20250429050010.971128-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We have to be careful to expose struct kvm_vcpu_init only when kvm is possible, thus the additional CONFIG_KVM_IS_POSSIBLE around kvm_arm_create_scratch_host_vcpu. Signed-off-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 84 ++----------------------------------------- target/arm/kvm-stub.c | 77 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 82 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 05c3de8cd46..c8ddf8beb2e 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -94,7 +94,7 @@ void kvm_arm_cpu_post_load(ARMCPU *cpu); */ void kvm_arm_reset_vcpu(ARMCPU *cpu); -#ifdef CONFIG_KVM +#ifdef CONFIG_KVM_IS_POSSIBLE /** * kvm_arm_create_scratch_host_vcpu: * @cpus_to_try: array of QEMU_KVM_ARM_TARGET_* values (terminated with @@ -116,6 +116,7 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu); bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, int *fdarray, struct kvm_vcpu_init *init); +#endif /* CONFIG_KVM_IS_POSSIBLE */ /** * kvm_arm_destroy_scratch_host_vcpu: @@ -221,85 +222,4 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); void kvm_arm_enable_mte(Object *cpuobj, Error **errp); -#else - -/* - * It's safe to call these functions without KVM support. - * They should either do nothing or return "not supported". - */ -static inline bool kvm_arm_aarch32_supported(void) -{ - return false; -} - -static inline bool kvm_arm_pmu_supported(void) -{ - return false; -} - -static inline bool kvm_arm_sve_supported(void) -{ - return false; -} - -static inline bool kvm_arm_mte_supported(void) -{ - return false; -} - -/* - * These functions should never actually be called without KVM support. - */ -static inline void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_add_vcpu_properties(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) -{ - g_assert_not_reached(); -} - -static inline int kvm_arm_vgic_probe(void) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pmu_set_irq(ARMCPU *cpu, int irq) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pmu_init(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pvtime_init(ARMCPU *cpu, uint64_t ipa) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp) -{ - g_assert_not_reached(); -} - -static inline uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_enable_mte(Object *cpuobj, Error **errp) -{ - g_assert_not_reached(); -} - -#endif - #endif diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 965a486b320..2b73d0598c1 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -22,3 +22,80 @@ bool write_list_to_kvmstate(ARMCPU *cpu, int level) { g_assert_not_reached(); } + +/* + * It's safe to call these functions without KVM support. + * They should either do nothing or return "not supported". + */ +bool kvm_arm_aarch32_supported(void) +{ + return false; +} + +bool kvm_arm_pmu_supported(void) +{ + return false; +} + +bool kvm_arm_sve_supported(void) +{ + return false; +} + +bool kvm_arm_mte_supported(void) +{ + return false; +} + +/* + * These functions should never actually be called without KVM support. + */ +void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_add_vcpu_properties(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) +{ + g_assert_not_reached(); +} + +int kvm_arm_vgic_probe(void) +{ + g_assert_not_reached(); +} + +void kvm_arm_pmu_set_irq(ARMCPU *cpu, int irq) +{ + g_assert_not_reached(); +} + +void kvm_arm_pmu_init(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_pvtime_init(ARMCPU *cpu, uint64_t ipa) +{ + g_assert_not_reached(); +} + +void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_enable_mte(Object *cpuobj, Error **errp) +{ + g_assert_not_reached(); +} From patchwork Tue Apr 29 05:00:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885707 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143326wrq; Mon, 28 Apr 2025 22:02:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgPT2HnwnQQw9Jx5mD1GApkLrtcDdijCWOhV94A/boVUUSU1Pjp4HHnlf22C5eTouWaH31rg==@linaro.org X-Google-Smtp-Source: AGHT+IHLK66dny3qOCOP8Z/a89yN0+ffxVGElEiCxcFwqOi00lvzGT+1D9DoWZPDEktmBHhU4Qce X-Received: by 2002:ac8:5889:0:b0:476:790c:739a with SMTP id d75a77b69052e-48131806878mr208318021cf.20.1745902938439; Mon, 28 Apr 2025 22:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902938; cv=none; d=google.com; s=arc-20240605; b=WUp6JLVcntt7MnjtybdcpCh5Rco2GzkBduz1UtKdJVsv47Q43Dx4/pht6n8vyncF0Z mFuBsImKOmJZSkm+4Y/8Joar5tq7A63b41uXbUKny4cdjW2vM7PFGsbPyVGexExvUCwf /a/NVTHlWr/2wCBsN3Lb15vdLTCexF9XZSMui8e8YSwxBfei34j3bvUMau88cObi1VXc PSxBAvZ5Ayj0DNs63nsZym0P7/4Nwg1nyxd3y1ydVN0oLIvbBLrnNEFZUyEzyLMsVlN6 359OlnAtxHG1fuOBCbmpYLblQ0R65keAiswdZkanZp1Eb4t2xagIE8upx9L7OwpDQhMq o2ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=UJq9VsWR8ZQrO9XhFlNkbnaVQrh6xM31N7zYQNVkPeUeFQ4UGMqClpbOEoGQvLObbk KeyrUWXUe+07Yp+BiAuu0sKB+JBCpvqlEdNJ99hwcf5VfVFIKcCPxZqTFtI8NECKpPsn Hnu5mzs6qqBGKs6z0diongMz+SKMtYYrHzSO3AiTzCnMs6J9X9diFZ4xjuUY2u3Z5fqR 9/yBgdVhbZg287JQSVEJuLjTUmJIjRP62anmlZ4DjNHetfVgN+snmCddtMBzg7jukTiL 2LIWv9o88hbu7lxVhoMJDtNRSlXSXJoHlsx5RxKK0wspxnqKwzc4PZe0WL4djsD0w5id dJvA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tu3nrhDG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea26a52c4si117078941cf.571.2025.04.28.22.02.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tu3nrhDG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5n-0008UA-8r; Tue, 29 Apr 2025 01:01:15 -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 1u9d4y-0007ZT-RA for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:27 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4w-0005zN-CY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:24 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-223fd89d036so69119235ad.1 for ; Mon, 28 Apr 2025 22:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902821; x=1746507621; 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=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; b=tu3nrhDG19IyRXkTgxJoaBuZ06NUmDjZkefReivDkYsjrI9iV9XccRsgG1owMA8Zx9 39xO+d18/F/rIqLLetM/Yl2+aiQ5tqXAjVdLTrykC/HQXsFFm3tIb9f7smtX36nWdwdm IbYUNbL/PNEDxyk6thDGq50XaXH2Jxyh0y6prbdqEKnuotdWtWzIsd7On6WQUK/mzDVF i7PeEEmKB74KQpZ5qd/0CKLbQtH2CxSdtcW7lYP6scsNxbr3JpkaTRMrAUkIe+mcz32V 41ilqjYPZ2zKi/pPiV4Ba7ztE5euHfSCSZvd2Husu45tRMcvXGceDKBFO4XiUXVuhi5R ZIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902821; x=1746507621; 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=2y4EwfHA2FmjYRfAFQnR46OcrZnAFzvzFB4cwR27V9E=; b=jEfuLjSi2UzAkTjEXXvLdaPss3cgV9lYokpyuQ7hYgihlqgSZjCx0pMqmyFdnDZmcV BPc4qWz07lqCMKgQGsBFkyBCuUCRQhGE4NWM0jhuclMt4jsW26bIj/BQx3QtSQJ0lnvF RvUog2TuEowyhVN/LOns1V0MCiwpys6x+onAdwpCnxdlPQmxmoHhhP9l1M4HZ8pfk5Mi izZSYTtizLufHUjtyZB5Nr7EvVIanB1+Hyc3JiJOrJ8p8Os8EGeIhSJ2Rx3FdZiQ/p+H 77UZbXJB9ZzvkJGByKw6mJjOTLOcaSlpV3skxoIwYXrDYNe8fNQwP5a0vk9enx6zp/pu d7ww== X-Gm-Message-State: AOJu0Yxvp1agOYN9hy/1zdCrmbuwXRkXIP9rv4yX+sBxxtr/fc+kGgd3 4qVxDnxiSFrY/F0vqgXShzEz9M+/f6YK4MLyV61WUeVZLvPWO2G9AHguSa3dLyapMIpZWcNR2xw 7 X-Gm-Gg: ASbGnctA+r7mxAluazn5ZkwXHAvIIQpCr0o52whsE5Z9LXAxwULvqgp0h7xLFy8ECIJ YB1p+9MdqXJu4VNyAyU1vYj1n/mwtEK9d66JwN/4/rFlvHX+dMz1OBOqtPrCp3Nf6ge3wpS830M Qi1qU0LhYOTPnPoaTcjwRBCQ911ieAYVr8y7jckI315jLz3pViOp32T5sNEYZ3zafbSg3n4gLcd /LccUAIKljxqtzcftaAqs1H0DxILcG/H4MkSVAF0t4SheJUPA3TqeWY6mRI5uaF5Lq8PW4dGTzL tXJRj+uw8ezfJkyboAOtSzlvVgTD/AhFv5FiiRxH X-Received: by 2002:a17:902:e841:b0:224:f12:3735 with SMTP id d9443c01a7336-22dc6a09655mr168001025ad.31.1745902820862; Mon, 28 Apr 2025 22:00:20 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 05/13] target/arm/kvm_arm: copy definitions from kvm headers Date: Mon, 28 Apr 2025 22:00:02 -0700 Message-ID: <20250429050010.971128-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "linux/kvm.h" is not included for code compiled without COMPILING_PER_TARGET, and headers are different depending architecture (arm, arm64). Thus we need to manually expose some definitions that will be used by target/arm, ensuring they are the same for arm amd aarch64. As well, we must but prudent to not redefine things if code is already including linux/kvm.h, thus the #ifndef COMPILING_PER_TARGET guard. Signed-off-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index c8ddf8beb2e..eedd081064c 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -16,6 +16,21 @@ #define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V3 (1 << 1) +#ifndef COMPILING_PER_TARGET + +/* we copy those definitions from asm-arm and asm-aarch64, as they are the same + * for both architectures */ +#define KVM_ARM_IRQ_CPU_IRQ 0 +#define KVM_ARM_IRQ_CPU_FIQ 1 +#define KVM_ARM_IRQ_TYPE_CPU 0 +typedef unsigned int __u32; +struct kvm_vcpu_init { + __u32 target; + __u32 features[7]; +}; + +#endif /* COMPILING_PER_TARGET */ + /** * kvm_arm_register_device: * @mr: memory region for this device From patchwork Tue Apr 29 05:00:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885709 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143414wrq; Mon, 28 Apr 2025 22:02:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV/boBtQZc4nmX0T/QGL43Na6/GdN+7I1TLFWZaKOCQalz06bMWAlTOQknoxpQBRDZvTvM9hA==@linaro.org X-Google-Smtp-Source: AGHT+IEFmb9EnszEmjgqFczkijady58UA3Je1Z4NlijbCs0LKf2/ZIdeKWbo7k7jswSq5cO4CRJ/ X-Received: by 2002:a05:6214:2486:b0:6e8:f464:c9a9 with SMTP id 6a1803df08f44-6f4d1eee17amr200679136d6.2.1745902952817; Mon, 28 Apr 2025 22:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902952; cv=none; d=google.com; s=arc-20240605; b=hSZP4seUDSsu+WLpcVyQapRwH4Bb50jQMsJwb2Np0CFV8PrPZkWeL/dakRgcz95L4a HGwxsjElf+/DZNC++6BLieOSG+zHqE1DfSanyxYT0vvKkOAY45s5CMCjVK9/qXO2F2bW Yn8Nt1IwW8E+fLqyDCf8HTSqEslNnR8lQRTFpb1zOYQo1QIHkwWu6HqDHxN+sZS24bT9 5J+swi9iJT0d+TE2gENHX1sPWCjsjWWZC1+IL8nRoo7wfObOmiaG/XZnsTtZBZ2b50Hh hCaiVqtsy1lApHxvw1CZZpaETesvdiu4J1cWXyIS8GV+acimIrOjhi5J5azrc/t/b4LV ljvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZmDBK1mwNkNbnmEBtgMmVcGSzIRc7rMtBzbRfWVwQJ4=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=lGC+GzqJef6XJ7DkuFI65aSRLFaYc7tUEPLL62OVTzSbPQ/ZWcVZi9j7r/vJ1brUEW 86K7jd1DiNt0CU0jXgcFjzr5wOS/lwA3eiFfAAQO/rCZXQ18VxE/w6TR/AfyTe6cZaym mLs96tBj5dqaVba2O1BoS9OhQoGsLAiOoXc/pYi2BrpAS60VBs/0jq+ppnez4gERKcdB RUV4JTXojc27XH8j2Um5m+6R+NsMistjF4HaW6HBiOthui62q/MfPkG7eSF+OkX7lQrP zFe0WhGxdWSX+X6kMYRq50R/YkEh3GGupKMivcyqxFdmlswdA+EFy9vhnT40uQpeAzpz LfKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yT1cEf+v; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c98de22dsi96489276d6.193.2025.04.28.22.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yT1cEf+v; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6k-00018T-05; Tue, 29 Apr 2025 01:02: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 1u9d4z-0007aX-Ks for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:27 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4x-0005ze-49 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:25 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-227c7e57da2so47219455ad.0 for ; Mon, 28 Apr 2025 22:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902822; x=1746507622; 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=ZmDBK1mwNkNbnmEBtgMmVcGSzIRc7rMtBzbRfWVwQJ4=; b=yT1cEf+vtQbWSfuaTa4nli9sIA6eFilcZrmLQXMneMMyg5BOBA688rW2mKoRiGn23h 2AQ9uFF6urvVjBQlJfEQDPeuNkJVF2oTZAktElQ7Hl2hHTw8tXFNIq1D80LGMdEemaF1 +jpYvHVkKhBVa6BCJYazYTkieXaBvCZ6Q1RElcBAIkKgzPzq2ZCcXT8tRFmpFpaEnuWb ucYXUSQeFzPGIr83qqVhKdNYgDMak5eqQGm1LREN+vN8cje7udbj1Tl+bHg4gr8QdafY UYiqpmRxiyo5auS/e+AEwyd4Zmr59uL4+ptIrjzswCSrzTbAItn1PGs/+I544mjlLZrI /h9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902822; x=1746507622; 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=ZmDBK1mwNkNbnmEBtgMmVcGSzIRc7rMtBzbRfWVwQJ4=; b=ieNoxgT+/jXZ0OoE87AteVNfT+E4v26i5yMKmjKyCQ7T67Qmb/QaCfSX45qCMfmA9s hexV/9Ob3tHQ5tXn6jelYn/s84ikH/CN+1H1EHCvbleyx9xTyNmnbf8trJ0bS9ZsF53d 7XLyx2700Z3k+K71XDcOaNFkfBI89jyRKx7RF6k1Vx5KNQdrt4+8kDFvG5A3XxgXiUiC 3GuhepShap1GDmLCgFlDl/ErKQ6jJowKYmmpGQpXqG5olmRuzR/g48YcEWNvfZQXaDPu 9vCRA/2UKgcwMQkYf7jtflLyp4J4VT7ROVjHPfrNjJErFD//AveSPJWx1dZXN/O8dqMW wxoQ== X-Gm-Message-State: AOJu0YxgqRTDOxLhlrKlp7SaJ7ccwa1CB9EtlzInn4i4KTeo5E0UJ5Jb UiAl5CPrBygmin4CAj5fUhNzjrKFrpnfzsj65px8ngJkPwbpQ2WlZx8285WLZHpEtKPXpzQUIJ6 K X-Gm-Gg: ASbGncvijdjusSYfrByz5AUNWYiii/L2U677ojldjFgACcWRvEMGxnXex1AdiJV+RRP BuSxf5GOYqJbG6d3n6Y7QSc24v8sd+jsDyiv37NmcAqidHUFCHvDKg495R2IzGGIM8oB0LVtgZ0 Fiu4ARyKHgmQBcPBau0cx1mU8WuIbBfIVLbyAad1Q7gkyCRXY/vhJ57OCnR8mMwIu/daOdv9qjJ SowjqXPryrapSz+Rc/6/CgWGJTyiBaU6gVUP2juSF3ECukjOi8d4w8zY+LfrwaMq7bzvwsybnRj oLPc9NHFEzQyBsJ7XeOr28R0oVok6KUsA1iVA2OI X-Received: by 2002:a17:902:d2cb:b0:224:93e:b5d7 with SMTP id d9443c01a7336-22dc6a546bcmr176908975ad.34.1745902821676; Mon, 28 Apr 2025 22:00:21 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 06/13] target/arm/kvm-stub: add missing stubs Date: Mon, 28 Apr 2025 22:00:03 -0700 Message-ID: <20250429050010.971128-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x632.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Whem removing CONFIG_KVM from target/arm/cpu.c, we need more stubs. Signed-off-by: Pierrick Bouvier --- target/arm/kvm-stub.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 2b73d0598c1..2d369489543 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -99,3 +99,13 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) { g_assert_not_reached(); } + +void kvm_arm_reset_vcpu(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level) +{ + g_assert_not_reached(); +} From patchwork Tue Apr 29 05:00:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885710 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143445wrq; Mon, 28 Apr 2025 22:02:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3OD8EQub+KMBpqDgQb8Brim1OPZahp7PYjjaxnaQMm9j0KkNPz+L3IwChs9tU6/rGMdmHXA==@linaro.org X-Google-Smtp-Source: AGHT+IGBhm46zXsLPlg5sRCv9ZZW59Qboh8Kq88A2qjLRDk1F70dXjLYWuA69mN1ShSJZn2FlW9E X-Received: by 2002:ad4:5d65:0:b0:6e4:7307:51c6 with SMTP id 6a1803df08f44-6f4f27abea2mr24289936d6.34.1745902956246; Mon, 28 Apr 2025 22:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902956; cv=none; d=google.com; s=arc-20240605; b=ElrtLSY8u+IiGMdKSA6DoSBMmH6BJNS+7hhmI7eIyoErCxXQNPDTc8RKEp4Hi3y2NS 0oYmQDK7Dn3RDiW9cn6ARKGSsbFp40ReBgJLmDsbIrfcu/ypvKNEr5A334zGmP8Y1yAY 7D3X0fsBNHr5IU+yKSdzWukXoKrDrd4nc3u9GsrkfYn+NlaWJ+lOmMJYU61hbQtrVAOn 4X+hXcLnU379fjo9uaTcAMHGc+Th9Wuj+qjkZyAj8buGq3kH2cXWTVEXvprpYyBYg4AZ LR5W/qGl6mHrp49ZhMxyztofXQHK5781REYvs8oBn/oKaGBQymfbyRApzq8EAkElC2NU YkxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=amXX/THKLt9of3i5C6GzRyhvwR1vAr6wdZGYECnCXXM=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=cSx9slykjFDgKP9//oGwagL7ekxrgYB4W83wP6PhyEF4GdUzeDTrU4mXCjsEyrMDE0 in+UC84yYDUi4lDXcfHEW79IFRA/6FReRRgiHf9sHiQebrp9VR3H+jJD/5PN1yzb29qM A/CO69TK4akVW+NUvDYl36REzJrTzbWN9sBJkD6uca06b/9+c0I4zZwCdqZd3IScfiY4 S5sZzTDp289/N/EkliJTqhUi2nzpnXmwHqZD2gUwghy0CJNwe5uh3mQgXfcvMTDE4mU0 PMkYVwNHgw66jY/PAqHdzvkSv6FmzNhWfoaF3dCD31fTcFKPRgcZHE1gBnlIZ0X2qI21 bOSg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wB5c1W55; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0b0add0si95732976d6.418.2025.04.28.22.02.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wB5c1W55; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6d-0000pv-DU; Tue, 29 Apr 2025 01:02: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 1u9d50-0007bd-Oy for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:27 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4y-000606-NG for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:26 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-224019ad9edso84177525ad.1 for ; Mon, 28 Apr 2025 22:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902822; x=1746507622; 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=amXX/THKLt9of3i5C6GzRyhvwR1vAr6wdZGYECnCXXM=; b=wB5c1W5563ERc7sKy3Td0m1tbrk2SUtH4sq9E1NF5ywAIhB6AvVT4rH8TeidHyDceB w/MWUDHg12etSQnxgE4bURezkrtjQgjnIvdC3FyNPyqhOdZt4palWcyl0p6smTE1wmak qp06nQq1W/Owuly722NeafIIndeAj/qV0ikjnDuwI/NhEtiRL0C2ehTxkH2rmkDoH9cE 38QJO6d15sNNUanf0Ve1H1aTK+lBu4eJxTP4ohqOwAI5/ddddrgzF1zabDIef4Fde/dX ErL27AVQc5tyn+oE1qdhYVsmp4yzyvLqjt4OoovjeTIF4+K1Oe6Ksnzd7ym3kcFmxahU v/Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902822; x=1746507622; 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=amXX/THKLt9of3i5C6GzRyhvwR1vAr6wdZGYECnCXXM=; b=GGjMZ5bsN+2E++24hFgCwshmpvQIhKRkFqhrKjlMTSZbQtZ2S7Yqpcx66nVFb7v5Pv LtYnwPfJyNO2+nxk/AGRTuUhvp5NPNCM4U+jupW5S93p5f8K+7s+tpYtNz7xgmDzf5ky N5HRFL5yYjU+vKJfjrux0t4sjkrk1bYOCNH5H7XIH+TmbI51dkNx97V6eejkULXvcUEr kzqOjGRJjVn/5sjGG11wi64YL7qjLmDjSJ+68+dG4U53X3w5tVeo2DDHUxb3Blo/jZDD myv1zLY1ZnyUDisF6109KN0oM4jf7PgU5G+CfO3ezPqiAgb91R9l2r+CmexeTnaRzR5i OPNQ== X-Gm-Message-State: AOJu0Yy0VD2sixIgYdl2cx6piQa4NmX7ILaT8mj5mlHYfYThJRqaq+UQ fA/lL3c7qKXmIjN3mhZ7xx/v2qSH0b1ewheS2qGeSHObcH9CoYHYsyhaHfP8lOQ2iUikoFFLU+7 b X-Gm-Gg: ASbGncuEHj0k24sfzu+W6VoVKg4ZdcoSxp1yGypcnK2LkuwiZSmy8n/T8O5ejS/qbp8 tLg+EpG783iX17BC6lRaO+wQwUdn7F4xMjgRTK0zbtTH1LQZJmoMIXrYE2UOCqEAqQY1waC7BiL 0T3vsvJMAPrJ+TtyvJKAQ3RGnDh2zM/QxHhznM5AfLMijUaX3E6FhKFve2nlVfr38GoeI8DtHMw yWD9l/omvbGOOO028hXqsfs7rhiSEi8fvQQNVTDYVJPc+FFG0KU6JFiemwuKbq1b9NKUlerkbkc iAd/ajZgNLs908XghXgUIUgMRyyUht25Zd0wPvsQ X-Received: by 2002:a17:902:da8b:b0:224:10a2:cad5 with SMTP id d9443c01a7336-22de6f7e6a9mr26233645ad.10.1745902822519; Mon, 28 Apr 2025 22:00:22 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 07/13] target/arm/cpu: remove CONFIG_KVM from arm_cpu_kvm_set_irq Date: Mon, 28 Apr 2025 22:00:04 -0700 Message-ID: <20250429050010.971128-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This function is called only under kvm_enabled(), so this is safe. Previous commit took care to add kvm_arm_set_irq stub if needed. We need to keep a CONFIG_KVM_IS_POSSIBLE guard because this function uses KVM_ARM_IRQ_CPU_IRQ, KVM_ARM_IRQ_CPU_FIQ and KVM_ARM_IRQ_TYPE_CPU which are only available in this context. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5e951675c60..e7a15ade8b4 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1101,7 +1101,7 @@ static void arm_cpu_set_irq(void *opaque, int irq, int level) static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) { -#ifdef CONFIG_KVM +#ifdef CONFIG_KVM_IS_POSSIBLE ARMCPU *cpu = opaque; CPUARMState *env = &cpu->env; CPUState *cs = CPU(cpu); From patchwork Tue Apr 29 05:00:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885712 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143680wrq; Mon, 28 Apr 2025 22:03:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGhlUVlu3Dufylq44P79b9IMESA7lqZQ17IGamgEsHGb7wK6qJxm3I+2yD6fPECxGZJHUtog==@linaro.org X-Google-Smtp-Source: AGHT+IGTB3fEqLfSkltnzTaK9wasbGhmhgEvkGWsrnoQkscTmVRKz30A9HprfpudUBglwNqVeFB8 X-Received: by 2002:a05:622a:6188:b0:474:e033:3efb with SMTP id d75a77b69052e-4885b28722emr31140331cf.24.1745903001029; Mon, 28 Apr 2025 22:03:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745903001; cv=none; d=google.com; s=arc-20240605; b=c65adtQPKDBq1zYeiu9Uwi6vXOcFFlR9r96m8LNWItQIU31UAiAngmhI24IZv9Zvea 5gFZ+LsapRrkdvn16M58hAEibaJ3haNkWD5yr18dYAKkCcETbAez4KGvfvZJQ7Yu/Y0K JkHhTqeZbOtqBjcCRXO28zVLthoW9mXW7yVQrZDpumdoZdvoPC/fS0yJzgd4KQI9qW8h CjH+Qp/6BMt4ML67S0DD6srwmfD2jmhqH6UO9O9KYDG884+6JDaWsJN0Y2qUPGgjOMQp GXLYRSkI5QGNitiD9HsG9oi0K3PS3HVFaPnK0/QsqKLvF5mo3AsjZ/ZgwCZrZoWxGIDf xwkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gyyYrSBpMjZGqDtX9J3tyJffb7EP1/gzXVNNR0hz1h4=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=NYfHVZbbbopkYlHBIOrhV3EjGHhqIKCHHUXqTpdYqqNI+REFSvZhXD3WP8J/utuAHn nTS6dplnKhuCcAopPNSNHvpV5XdskrHF8Y8aYbdgZs0o1ZVfs1ndMN146lTKm2x0IgGm 8vyQ/AXzVp8z97q61tfadTbazv2ac7yCm/rbs1BATq7Uz66Vg2JbJFz2U6Q5WhV1Vghc 0ResPglnJgIvdM1P9cZ4x27Nd1MDRXmcUYalz0Ke/Fmj2gJlhuxTtvTyFYMVcOZuLB2I aOAGEZx9P08pZduemcN25/b5zOMt3R+Mei/UpNXFrt/Q+i0dCmpc0fNnF9V7jceQ84Oi CegQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a8bunHGV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9f3c0569si116889851cf.38.2025.04.28.22.03.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:03:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a8bunHGV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6U-0000bl-GF; Tue, 29 Apr 2025 01:02: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 1u9d51-0007dL-NM for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:29 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d4z-00060P-7f for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:26 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-225df540edcso66043715ad.0 for ; Mon, 28 Apr 2025 22:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902823; x=1746507623; 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=gyyYrSBpMjZGqDtX9J3tyJffb7EP1/gzXVNNR0hz1h4=; b=a8bunHGV34NEfR1MtLAwbGoswNscaly4kONN9c4YN0rr08t4FLT2sZ6DBQKZ1XjmBk ZnnDJFBBzPLvoAcFzYIPeSKf9hk8rJYzgGdeQT4J7kPj5qr64S6CfghbnqTlk2stAi3F 9RFVXzuSarWAhTwh1OjeoF4Al8GA5YPu18hF/8JbP4O9H0Upk1z9rI4hUM1oBp27V2sh OZx1AjnlqVUjeG8xrEMkwneHIIFfMiAsZFTr2fYIAMza1o8DnQkwf5gtdlBWL5sdUOmO DT0KYOfLmZaGBuqr0Wg91WJOPLPIhAPSNP4rLhj0VJm6RCu7+1x+DDmVfQYQkmMwm/74 XPKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902823; x=1746507623; 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=gyyYrSBpMjZGqDtX9J3tyJffb7EP1/gzXVNNR0hz1h4=; b=DH/zl9LPTzbpLNbhNnULVaxZkID2Pm/4bMMsyHAyjTQQwCyxACw384db5mNeWOPIcP peqoqLGkbuB+v7vVxJPrV1jeO8jyNYDpob5uGL6JRvrAFCZXbIBn3Vh8eXrds37igN7D V0RUpCNXVDQaz60/v8m5oB2sh50bVkauZq8sYMOxZTyUMykKJhRukQC5sn1GD0B8gQRX Qdojl1Y+D8LQ1NAUTa8oLYhrWcIc2n8qRj87U/w6FjDfrVfAcIwh/WaMrvfggDyl0Rfp KUjP4wL3e5Ho511TBeY0wplVUMMOw4gEe4+6s0TV/ywkBzl1dv4NclK0o/znhtt4e6rQ Vu/Q== X-Gm-Message-State: AOJu0YzbjCBNw8PyNltv2Ts+rM1J7tzb8bh0EevwZgF8D0a7jKz5Eu1I WE4RnZSOuhr1FASzn4ZkZu8+Txuhyx92slVEvzy5DPh+HL0Ms2wQy+QvmaJBgCc4BKYHkbzU4oT g X-Gm-Gg: ASbGncvyn2G6UG3zPFiy3K407apc3kQQqxW7Oir363R3emDaUbxCp7LjgBqsvf+dYaj jNZv/za98vNsrXzVgQ9WBDOAmYq1Vtd68r5qkwzKXCQlgZOFaWV604S3OZHpf76ISWBtTZb4YXh JMCeJScydnizpT4QKBaAxUVskUwYB6O7WpsT6aWnj8O5CNOk5ZNwWYIgEYS261/RVhXPsxpEpGo 9TqGqR9o5G/BZT0GkXFEC3XM2RlvyqBcmfJNuq/UbXyVyZgdFlGIISydaL0EvG3lyWHR9HBfBXs CAIX9KMDUM6QU7IZqsyfJ5rhQUWIhxWa4QV3jvAW X-Received: by 2002:a17:903:230a:b0:215:742e:5cff with SMTP id d9443c01a7336-22de6c1e39emr23981905ad.16.1745902823374; Mon, 28 Apr 2025 22:00:23 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 08/13] accel/hvf: add hvf_enabled() for common code Date: Mon, 28 Apr 2025 22:00:05 -0700 Message-ID: <20250429050010.971128-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Other accelerators define a CONFIG_{accel}_IS_POSSIBLE when COMPILING_PER_TARGET is not defined, except hvf. Without this change, target/arm/cpu.c can't find hvf_enabled. Signed-off-by: Pierrick Bouvier --- include/system/hvf.h | 14 +++++++++----- accel/hvf/hvf-stub.c | 3 +++ accel/hvf/meson.build | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 accel/hvf/hvf-stub.c diff --git a/include/system/hvf.h b/include/system/hvf.h index 356fced63e3..1ee2a4177d9 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -19,15 +19,19 @@ #ifdef COMPILING_PER_TARGET #include "cpu.h" +# ifdef CONFIG_HVF +# define CONFIG_HVF_IS_POSSIBLE +# endif +#else +# define CONFIG_HVF_IS_POSSIBLE +#endif -#ifdef CONFIG_HVF +#ifdef CONFIG_HVF_IS_POSSIBLE extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) -#else /* !CONFIG_HVF */ +#else #define hvf_enabled() 0 -#endif /* !CONFIG_HVF */ - -#endif /* COMPILING_PER_TARGET */ +#endif /* CONFIG_HVF_IS_POSSIBLE */ #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") diff --git a/accel/hvf/hvf-stub.c b/accel/hvf/hvf-stub.c new file mode 100644 index 00000000000..22e2f50c01d --- /dev/null +++ b/accel/hvf/hvf-stub.c @@ -0,0 +1,3 @@ +#include "qemu/osdep.h" + +bool hvf_allowed; diff --git a/accel/hvf/meson.build b/accel/hvf/meson.build index fc52cb78433..7745b94e50f 100644 --- a/accel/hvf/meson.build +++ b/accel/hvf/meson.build @@ -5,3 +5,4 @@ hvf_ss.add(files( )) specific_ss.add_all(when: 'CONFIG_HVF', if_true: hvf_ss) +common_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) From patchwork Tue Apr 29 05:00:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885708 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143412wrq; Mon, 28 Apr 2025 22:02:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQTP2I7xNMPtR11T91x2vBvG+OMlBhULhhA+JslV1HjCBnQtCVp++pJaZ0831vgRMWfirg6w==@linaro.org X-Google-Smtp-Source: AGHT+IGodxa4k5nfE/eJzvYw8OqRaQrm2UxNP/v1veKBclsnoLc3uuqv1kAhEQH1SA4LS6VoQIER X-Received: by 2002:ac8:7d43:0:b0:476:aa36:d674 with SMTP id d75a77b69052e-48131de3bd7mr191141171cf.28.1745902952768; Mon, 28 Apr 2025 22:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902952; cv=none; d=google.com; s=arc-20240605; b=QdXCyogP4DWefzdHSfZhyF2WepDf7RYR5Gz8tOxgdv0GY7bSmFlhDFTTIEtbIWvRbQ NdzTOga+UtfdB5FE77QM7NKvvDXHg/QJHF1A8X64Nc1I86TKThgOms2DQit42p8hn5Lw 5gQWDhZQhXaxF2rZkrf4DjZsmnlmejxDIturcmljEI88ms1z9BSYzXqHw9LQaVR7FUB4 HpGVdihIwX0ENbPrX0Et6L7SBtt65qYOJgWkq8aAOd9RBD1mv17NZnNX1rnDKx7VacyM IiSwN3ujFAYu218ep9G9UDQX7lwSQ4X9JfagQGFzBAT/aujRtwHX873NWaAsDpyiSe8m +idA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oGLga5UEOZhK97fJQViOQTJRGL03WkVBEBC/7bd6T1M=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=ZhZ+RYqAFONAhzOK2h7/MYBrWHScO12xBjTzIoRXNZrL31W73almbYFJ/afmFJ+HZM BVt0JyztNyIq92/azVNzkiFvJ1mUpTSEASJ9fE9Z9FJvUtbdtH9aPC7r3HWYBlm2KJZW ifkuVWi3w3cRX9UucSRa20D5nh2HWEmNA9aeA6S39vlkFTOMJfyM4AGDpCbZN4CfcpxU LtJUT3YnvonEzD/0uuzANDslbaT44C2rQ1zCBk461Rg2FL2Nr0m6VDaodGf9RlSqR8qC 0OgvTLOmQCTxxrJw3+X0eeRUYx7M3bvge5JsZWPZVreF6k6J0qThFvg2Fom1ohOlxQAD 5ZhQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m+j7P9eG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea1e95c04si122745161cf.337.2025.04.28.22.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m+j7P9eG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6h-00012x-Tf; Tue, 29 Apr 2025 01:02: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 1u9d52-0007en-KD for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:31 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d50-000613-I6 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:28 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-224171d6826so83316315ad.3 for ; Mon, 28 Apr 2025 22:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902824; x=1746507624; 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=oGLga5UEOZhK97fJQViOQTJRGL03WkVBEBC/7bd6T1M=; b=m+j7P9eGV5XuVPSZmxsguyTLebdZ+0Nsr2IwvUZrEImsStahtZ6pQYTXYmxw/wODsk mARN96YIMWsOQTW9deAPPwtguj6zPFZKcOuCHmTZW1dyKyi0ur10Qu+adW4dFbZCPbxR xu22xIxjWwVdOt0XO37vdRPKt+gHMp7FfEQf9DXAaFh+FXf/ncavwNbvBrqN9izq6Hvl 3EHNXlw1Ik1MB8z5qsA0mWQ3ilJYlU/T6EYrNsKcU6gRHXVB1DcCBRHLBJhl80h4FJ1e +qKOAhKksCigYVDO+PVhhYfi4gJueTl1AXKiopjGVsg2nH52GdbDrF6fAqmrv1AiiwJX AyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902824; x=1746507624; 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=oGLga5UEOZhK97fJQViOQTJRGL03WkVBEBC/7bd6T1M=; b=k4oY53snaYgD0YbCqqPcBWRs6BggkVnPsDIjMMtE7VqBTdOosphy5m6SGTv6V/jB1d 9Dnj01vS9wThtz0+NImYZWOhncx8jjXk3hM1kUu+li7JPvqWHxfVgz83c84TGR/iL5IY eqDCT+FJe5hLZG7oaGgNN9IPwkC1vPv9hfJrCOviuHQzwfTWLeQxuo+LnQUn9ZTPotVO Kj823JczLbLStYXxcIbnsfGp6nDHUvqAN1MHu4TqJY4yGfZ367t8bW802WH7Xvys0j0W UK0UWwU1dM1CE0Sc6PVZ2IAQLUqWGp/9ya8oRe98XqQmtUggL3V79Whv+4QC0aqMQCD7 QC0Q== X-Gm-Message-State: AOJu0Yyq6m9WSE6h/czSyZ9wtJYzVu8WxQsUmWbPX4Q3sLFiFSTkZPwK vMQoZOxC4Sb4LSY9Kr7ReriyRLsxp+jpeTE0jsTksb+S5oENEC0CDpSy610+QNXh8Pi3YVKq/FD B X-Gm-Gg: ASbGnculgWkXUHa5jNwPrj6V/zKrWVS4+sE1LxjTVDrr9XCAQsX3XuQpFlWhbhkymmJ 2/X0SwspzkJ5BbSiRLrapLcc5HmiJVl9WsNQD/Ucye/vNmKmrDo88zC9iNc2EXcqo08BBRgrHRl njXIZ5SCd18q8/1F2iiMRyIF8/AoF01W/SYKJwOzmJXE7V4BxbEUjZUPSrY2vNWWrYAfK0S8OoM agYPl1oNsEmhHVNv88mB2Gf5GuBO6GfzZ8VP0wMkQy4z8W5cy9gpMAUpw85nmM9BC74ddB1Nx/1 TFkJXprzR4h/qBAzjEtKE1s9+p/+A9ogmvjvg4/R X-Received: by 2002:a17:902:e5cd:b0:21f:71b4:d2aa with SMTP id d9443c01a7336-22dc69f83d4mr156777235ad.5.1745902824466; Mon, 28 Apr 2025 22:00:24 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 09/13] target/arm/cpu: get endianness from cpu state Date: Mon, 28 Apr 2025 22:00:06 -0700 Message-ID: <20250429050010.971128-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Remove TARGET_BIG_ENDIAN dependency. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e7a15ade8b4..85e886944f6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -67,6 +67,15 @@ static void arm_cpu_set_pc(CPUState *cs, vaddr value) } } +static bool arm_cpu_is_big_endian(CPUState *cs) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + + cpu_synchronize_state(cs); + return arm_cpu_data_is_big_endian(env); +} + static vaddr arm_cpu_get_pc(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); @@ -1130,15 +1139,6 @@ static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) #endif } -static bool arm_cpu_virtio_is_big_endian(CPUState *cs) -{ - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; - - cpu_synchronize_state(cs); - return arm_cpu_data_is_big_endian(env); -} - #ifdef CONFIG_TCG bool arm_cpu_exec_halt(CPUState *cs) { @@ -1203,7 +1203,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) info->endian = BFD_ENDIAN_LITTLE; if (bswap_code(sctlr_b)) { - info->endian = TARGET_BIG_ENDIAN ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG; + info->endian = arm_cpu_is_big_endian(cpu) ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG; } info->flags &= ~INSN_ARM_BE32; #ifndef CONFIG_USER_ONLY @@ -2681,7 +2681,7 @@ static const struct SysemuCPUOps arm_sysemu_ops = { .asidx_from_attrs = arm_asidx_from_attrs, .write_elf32_note = arm_cpu_write_elf32_note, .write_elf64_note = arm_cpu_write_elf64_note, - .virtio_is_big_endian = arm_cpu_virtio_is_big_endian, + .virtio_is_big_endian = arm_cpu_is_big_endian, .legacy_vmsd = &vmstate_arm_cpu, }; #endif From patchwork Tue Apr 29 05:00:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885701 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp142976wrq; Mon, 28 Apr 2025 22:01:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW8cSOqn7cy8bvB93OWZNGaEMW2GQjqexKt9sIZoprxFHz5wEjNYvW8sQYre/v7i4kVLc2hEA==@linaro.org X-Google-Smtp-Source: AGHT+IFFJMxiDbU/DM758gC2zaZ+AacL82QVuhTSKpm+j452LbYvUsTv7A3D1jmmkKAsevIkh+jg X-Received: by 2002:a05:620a:471e:b0:7c9:5ebc:f048 with SMTP id af79cd13be357-7cabe7552camr229144485a.20.1745902885955; Mon, 28 Apr 2025 22:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902885; cv=none; d=google.com; s=arc-20240605; b=AcbcTAd2RkrtoMKAv8Q34HwzgoaQcKn+Rm0Woq2rRUFjwnCfcMQL4wbwPN5LJG1d7A gTuf98+Nzo3LCUbt3xdNIA4McKkgENtDlQ7VETTtdedg6uiQn7kyOTIMb5eCpQaK940z qC5xvhC3zTV7N6hAIBZfZVGwHlumqk2os2pmAu8CfLfjEK+QTRMb+nnJ+CsttiU7/vwz Dt0hdD5CM6FebO04ZNE2/uUBs1vb1H4tgjXuFtp81yeA5ZG2Fz7ipJKSvLWfJPC6OLZM ANP4nD3fEP+I0AtSV/+jabzn86OHX4ZMl+QtF377U7bNxbTsOg/jEGA8v5SDHvb1XgRu RBcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3lofZ2Bm8qaw0g+MX7QK5XKjfJFx9l5xRSef1IWMqPI=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=VuRfce9/eg15AFWAaLG0WNuQG8IIDiAUlCI4SbX3ATiXEysIeDdBqU0rTQl4/yXxMk ROYsUicPF39bKvQVzGhjOn+ozaSNTi36jHfqQ7jDPA1qcf4H9pA044O5ybEY8tH8WNNO Gk3ZIXU0qH+ZKil/DmMJoUtSHGhx+AAXg8DEM/RV+WtrzZctf/oCAlSJKhdAWrqs5VmS v3WP+fS4a4/1icDFxmz5TPRlevTIl7NO9sxS9khIBdWJTlk4Fxwx5rIc09Ba7wNzQk4Q wThhsVc+5u3BHuLTmxZEuGT1K2jxOst75f+FedllrCy2kEUSpmrK3Bn70eJe1s7uGX+f XlmQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=raYmbRQe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958ebf5c3si1146820785a.537.2025.04.28.22.01.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:01:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=raYmbRQe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d5g-0008Pw-3z; Tue, 29 Apr 2025 01:01:09 -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 1u9d54-0007hp-JV for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:31 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d51-00061R-Nd for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:29 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22401f4d35aso67683345ad.2 for ; Mon, 28 Apr 2025 22:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902825; x=1746507625; 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=3lofZ2Bm8qaw0g+MX7QK5XKjfJFx9l5xRSef1IWMqPI=; b=raYmbRQeS7kG+S9kKd61UZWqNSKkjxL2obe4fqyQ6QD1EaazXQKdtFsF1uOgkW4I4e 8oa66BtnKHDm8lg1Cs2j72QugHfoOB6qrouX4Cj++1RYF6kGj20j26LclDafVA4LQ708 5PdBa14CXeYuSKyWiTR00QAkQwE0zR9ADju991ojjv90kgI7Ia8r9Zqtpvjc5OJ0Tkg6 +tcwcXETPAWAjcLShGezqxmMoDG+NULWUXs9oSVXQ1L3902zc9XmHNhnL6hnIGqobZEf ajOQK43WhqVFltVJgZofP3uW4C4hw2kfNP3Z0A5u36E6od/aoh9nmjRhGx84nh7WQa5t dfwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902825; x=1746507625; 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=3lofZ2Bm8qaw0g+MX7QK5XKjfJFx9l5xRSef1IWMqPI=; b=pgGgN34cHPozsDlsUj6MbuJens5T/R2meM2XaHEhXe09dO4Fr7OPa6fALnlQMGpMrN d90pRp/aoR+aJrgq4IrC5Wlb/+HuoLmgMDnSz8I3hm++ogWrGzzQLeMYRrM7gG8Fr7bc fHSWXM86+mCMDLUQiRG8OWDu1X4ViQ1AOfcMb5PdIBcoXflF+4XzydWEovX+Ynqb8bsb X0s9F6SiKahD770bOx+gAzua7DffH4QwW+ZfVjQqtg7MTNc5zMKqCGSPl48DvCe/7GpO iko5S37VnIvD7yWcHnG5zm8i1zsZqUf2OcFg01iUUX1iMk5oPmoLeuAueGrHyodXAG6W N2tw== X-Gm-Message-State: AOJu0Yy4iZvCV/9t5nmcMb1Y2o1RwpYJZ7QcFrLNY8sacbGfynTEHJGh 5hS/2mArSMzhdK9Lb7CqwbhYbgQ6cLzmE028Nrfcrc5T6xgFTL8hIyCEv9MTliUn3UT5vdj/GnS 0 X-Gm-Gg: ASbGnctV3WUM0na5EInWydRhQ7WfZMSte1NOZA7HEBQALAByD2VgZDeCM7xtzSsSEhi rsIq3WCBG/l4ZX5tZvGqtaEQZuAQCDlrAElLYz2zX1RwcllY9X/iwgE127D3gXVT67SK7vvNLFh XASPES2kyqDA1+qO37T+etsdutTn/E2oz7TYvSAKBSXXo0VCmkH5cdhZUY0TJQgT4f0SsWLsn9K fZVLtm/wywkEKx+w1kxXcGcK8UJEN/9psbrue1nVrrYuphVsE4/DHM41vbdOmaBSbdq47NU42ZO IaVAhAQo1zOoPPenxRmSg2nXCr+1UO1p3UC5+EA60O7Enf19mM8= X-Received: by 2002:a17:902:f70f:b0:22c:2492:b96b with SMTP id d9443c01a7336-22de7015dfcmr25481425ad.15.1745902825364; Mon, 28 Apr 2025 22:00:25 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 10/13] target/arm/cpu: remove TARGET_AARCH64 around aarch64_cpu_dump_state common Date: Mon, 28 Apr 2025 22:00:07 -0700 Message-ID: <20250429050010.971128-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- target/arm/cpu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 85e886944f6..48ebaf614ee 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1213,8 +1213,6 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) #endif } -#ifdef TARGET_AARCH64 - static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) { ARMCPU *cpu = ARM_CPU(cs); @@ -1372,15 +1370,6 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) } } -#else - -static inline void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) -{ - g_assert_not_reached(); -} - -#endif - static void arm_cpu_dump_state(CPUState *cs, FILE *f, int flags) { ARMCPU *cpu = ARM_CPU(cs); From patchwork Tue Apr 29 05:00:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885705 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143267wrq; Mon, 28 Apr 2025 22:02:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXF1ZIRfnf6AdE6x2vB/iY2Ujq05MnsqQAuagbOasQHfQLsfKmdYCURi2GcbA6GlLtRXonyEg==@linaro.org X-Google-Smtp-Source: AGHT+IEASvhXHTtfaR+iZ4fNvq+AQlTPLQHNMxqK3MfqcWkz/MOKBJt3WhJ2xiSqlhPL5f64S5qw X-Received: by 2002:a05:6214:2b08:b0:6f4:c423:67b4 with SMTP id 6a1803df08f44-6f4d1efe6f9mr214624806d6.10.1745902926842; Mon, 28 Apr 2025 22:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902926; cv=none; d=google.com; s=arc-20240605; b=cY7/i/uSGRwJGywDoB85x4wR5dv6prQQl44aextjsOWOoqO285nkuKubad8BMBEb9u GCCuSYS1d9ChggEBiG/7NH7EZ/B8Q/Uy3fZb+JTN8QEUFzoD1istbxI0tNRF3Nqj3o/9 6wmub0XEfjAt62zk1P+ZbvOy4+91aJj1cohohFttjCuCjFT+zdI9uzlzhwhb35f4819w y4oa/VMsN5UXBTv94zU9eCASJmhQVX/Y77tkC3dmDW6WLLPaguMtxrNn91bIBTma6Fi5 0l06wCZgYS3fGpBZe0RxU0VjfabxqsdRoUoMUHbuauNltJEPJjxPH3tWQnbOHUNecX+d 810A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T48CGR80HJJotOhNXvyZIfy4YYqwAzwBstE/RhDVQ28=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=c5xrlMZyizthKiIdehx5yc3kNVesh3bsfbGMRc71kqn81oK7GZzBACI5Kz8JnILrbo LLsLZUdmyuS657PqnPOKI147c7Fx4ozPOcmYR20CGSObB6Wbrf/Og+clOOricpnowOaQ KTZTop80r1CwJZ3yV5slCniybPS6ODoj/3KpdBrXaYzXeLULa+TxgX4OUC/rFFRTTX1F u1TWn+TDGqiMAWKuuc8kq3CK55+v1lJF/h0uRjFVW/JI0sLLq7Usyy6oB4JI/Rz4Ffkg 05J2N8J9cp7z0n1T84KbFlnzk+CvdMsBGrQTXSII4nX1C/qC2DWdELq5HqyC4h7YJFVJ Wa5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ySU9sluD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea2aace7esi123841401cf.644.2025.04.28.22.02.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ySU9sluD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6B-0000Uk-Vl; Tue, 29 Apr 2025 01:01:40 -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 1u9d56-0007lB-0B for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:32 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d52-00061w-BF for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:31 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2240b4de12bso83081785ad.2 for ; Mon, 28 Apr 2025 22:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902826; x=1746507626; 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=T48CGR80HJJotOhNXvyZIfy4YYqwAzwBstE/RhDVQ28=; b=ySU9sluD+4KR98+I7Dtv6upHe3JE3MHC6cEh9of9lylRK51d3mdvv/QWgex3U+J+g5 em0+TcSmrnf2z0QLNIf1xsQvXAD77HrwWXzatxdl+JaaBif244ahNFviPrsgSlf5DAkP ZVvSRd125rOktuWspSi8qjYnFGr8gLETCD7ID1g1+4UUgIKYh2vAAhTjP1TFqHYHQKSW igBWMSwaQJjiF4o/Y4Ytg6gFC6nMKJRRIJDfHOSqDTMFxpfyIc3v2Fc2CkU8kgULhORg Llkait1Q+/VAY/aX8xK1Qr5QTo5KzmDyU4vObq0Ir5dn3urBCD+USJ7sm4kAO2lk749c uxwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902826; x=1746507626; 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=T48CGR80HJJotOhNXvyZIfy4YYqwAzwBstE/RhDVQ28=; b=NZxCNm/ymCU56IDj4H05S1ivpOzw+y1Oh3fAgsyLvbQZ/vqfqJ8hVZruTbQj7Nnt+e 2tjeDVH7eORGOZzr1YSnwJC06cG7+jRPI2p6a42GHaFYF9rNNUSUUDfwWdXnrmRGkTA9 tpifll/zbr5B/n7dnANjWeciNBHl3n6XoESle0xJ3SFszwj3eGzM4DPUTxZtp+W21/Ti LSsjGpHaMbSptzLAIJensVTLlZMgUnBKajsB2wftmpd2U/rPefPiXDAiEaEid0vuTDj2 8ESB0k09x84gpOSWBRLHG77PFSoNB5NUdeVVOkKCF3638FYHQ0qLirEt5EHl5jQ4sMCq 2kFw== X-Gm-Message-State: AOJu0YzoTDeUq+Z893YNV0/nc5KJqIHUGqp1hVNkwV/jR3tandRkJcl5 DYUHGhbqKnhpE+F1Tt/gLwJ8kAmCfrs/pC6v+BFJB0ObDNCAVtw4CedKIfu+lGmwqxOYpSpwFpT J X-Gm-Gg: ASbGncubXM0LNyOymOr4+wnQbC//72sb0Wgg7d8wIX8wGtthhVwrR3t2K5IoF+58SDt zQnEOO1r7XLSdOsAM3tje0VSV6O6l8mPuL7x3mR0SMYhDcJFETeDP1mc9eP72cB9dVsvQgKMsQh B19jBGgzvEw8bARigBrKgA80Z3evPe5+b8nIii1umzUuv0n04hc9jI3eX4xOYf0eLITM9dIxoKE JrjJB77yCN8gujE4PmxYGMj3Ku40nGKTHbRzzfWLpeiYpRzk5J07ixUzbBQj2LEg11zi0Dz01Nb fcFVxvWe+zDx6ayymDyVWcELKXnQ45bYz0bjG8v0 X-Received: by 2002:a17:902:ea01:b0:224:1ce1:a3f4 with SMTP id d9443c01a7336-22dc69f83eamr176304425ad.1.1745902826200; Mon, 28 Apr 2025 22:00:26 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 11/13] target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features Date: Mon, 28 Apr 2025 22:00:08 -0700 Message-ID: <20250429050010.971128-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Need to stub cpu64 finalize functions. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.c | 2 -- target/arm/cpu32-stubs.c | 24 ++++++++++++++++++++++++ target/arm/meson.build | 11 +++++++---- 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 target/arm/cpu32-stubs.c diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 48ebaf614ee..79a853609dd 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1908,7 +1908,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) { Error *local_err = NULL; -#ifdef TARGET_AARCH64 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { arm_cpu_sve_finalize(cpu, &local_err); if (local_err != NULL) { @@ -1944,7 +1943,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) return; } } -#endif if (kvm_enabled()) { kvm_arm_steal_time_finalize(cpu, &local_err); diff --git a/target/arm/cpu32-stubs.c b/target/arm/cpu32-stubs.c new file mode 100644 index 00000000000..fda7ccee4b5 --- /dev/null +++ b/target/arm/cpu32-stubs.c @@ -0,0 +1,24 @@ +#include "qemu/osdep.h" +#include "target/arm/cpu.h" +#include "target/arm/internals.h" +#include + +void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 3065081d241..c39ddc4427b 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,10 +11,13 @@ arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', -)) +arm_ss.add(when: 'TARGET_AARCH64', + if_true: files( + 'cpu64.c', + 'gdbstub64.c'), + if_false: files( + 'cpu32-stubs.c'), +) arm_system_ss = ss.source_set() arm_system_ss.add(files( From patchwork Tue Apr 29 05:00:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885711 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143533wrq; Mon, 28 Apr 2025 22:02:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKwnsMHLURs6s3e9NXDkMTP34ENe+Lst00CWHKHkNf9+SUM7LN8P1dcpB2HMNWpLvT2MvMmQ==@linaro.org X-Google-Smtp-Source: AGHT+IEecGnmUsuuz4Yo9GD1YD7x5tpDIIfosPLcZowDd6nt0X6VFVuNmWRjru33vZWTssg3uoCt X-Received: by 2002:a05:6214:d4e:b0:6e5:a0fc:f65c with SMTP id 6a1803df08f44-6f4d1dc7eb7mr216516566d6.0.1745902972917; Mon, 28 Apr 2025 22:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745902972; cv=none; d=google.com; s=arc-20240605; b=hrMWf0sqkn2JGSb9LnWNA4FmK0B9mtZL6dQc4/YN6FhboMSG0G05RkC9qEqDmb53tq 84AppTHcQL3G17VYkdALd8SXKG+eVMbg8LsdJ4vtoVTdb5zaW3Fqp0KYn5AJj/ozm8ks yqa2t7bkaVBQ6bvGDV6CCWcEV3wtEIr71JIYTm4mPDO1dNi0ikPp3mAfTSEuX+KnkTNW 0iXRkuSJAqUiDPTW4dDx2T3UaQs73jat/Eyum/6NfOK2HGKElosnMvwxPZzkyOYnESd/ myMSLyeJJgxQNxtpwnzdMh+T260jNAJ0nbEQ3v/GVXjhTEPrCC1GQ4GtH1HsAJi44nlO oqSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k54PyA3qe+UbX4AzHMockqDzIGWdHV1GUXIbKPo2M9I=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=j1d2UmdtlUmGq6Wx1+DKSCUC9jVWcxiuGbg3zB1xgmgM5GYUqez9m75ZfVhmhR2OY+ ew6+1GvQaVmO2d+ZI41x8J9+n0nLCYxFdpSgSIrXcpB22Ml6uw9LCAYBsg7teuJw0FMj hEzBZo+Uk4meAQv6TZ+ZWd0ENCBm8UpQCoNJA4DSep0OxsrOAX1O62ENnS6RqMqss3BR QXEWKwhE6z+9IZwoXTdL3UKzhIK1HDLALAY3d2dqCRKLrS8AZkUQkNDoSdfoXPAeU01l oTSSU3IslyFIsH4FALwqIsU9sQWBwGXxwJ3TBNkLDo3xMVy0r7M1kJ6UtbYK+ZscOCEm 2vFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lMD/JuAp"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4f123ac1esi13171676d6.286.2025.04.28.22.02.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lMD/JuAp"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6w-0001WE-B3; Tue, 29 Apr 2025 01:02:29 -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 1u9d57-0007o6-Mh for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:35 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d54-00062P-DX for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:33 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2295d78b45cso79682125ad.0 for ; Mon, 28 Apr 2025 22:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902827; x=1746507627; 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=k54PyA3qe+UbX4AzHMockqDzIGWdHV1GUXIbKPo2M9I=; b=lMD/JuApbxFv09LVnqJJsWusb+FRJqLAG+ZYJrD5Y21t1L+/mgq5+2v7CtbKydMfln AnnVAOalgRTprWUxoHX+eXJnwQTWyGHTmi9FuSGyjSy/DkFWd4nK6mvvw7AUBo7ylElZ oNJ3GlhFX1HEq+wUo3ayyi9DX0xGP/zXWVAYkYDl7e5NHxztjX3Ybyadj+vywaLAEWGU t2x6ntapqY2WeEI8GP0hg3m0nmPR/l9V0h/DHiAmn1UaM4xq/dAr0XNqf99fna/hP6RM pscL9//UbZ5aX0Rk7rNnhQwMb/xDiCcNQC/WZexcnWtFSYaphkrJ2z4mHVCcQGk6+Aps PIYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902827; x=1746507627; 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=k54PyA3qe+UbX4AzHMockqDzIGWdHV1GUXIbKPo2M9I=; b=ismRluAlm235jnzaW83k4gvsoaSRQAPcVeQnip9D0YJSsF5JbArlY5osHvQppjns+x E+lHJeoTAhzZ8RMvviPmChHI9DjgM+1o8w2+++fxHDA/Q5yo/l6L3jTDu8m3QTlfDzCA xKknHuVgRy8CV3saCtyc5pM/gev4Og/eL9MdXDpsFKvNc/Wnc4APVPDK4ypQnifE/8kT mskF/mPBUFwdkRHLSnUwVnKsO8MT5O9DDQbkWVlWnJjcyfrWzKZdOyWyhs2Z2Ix3u2nd QU8dptxcVW6C7TrPA3uaH8TmSxknJa1TkejYlmQcFf9OQlda/sxvTPqLw6KQZ/Dh/Xm1 mVfg== X-Gm-Message-State: AOJu0YyiLwoYhxv9r1LHFxV/UNNrCCnlEjccFQuXmk0SVS4TQMBLxrhs /nNtbAct12V+3pIvfpoO0FriRwfqUjwkLY2hL/rsl6SodSXrsJa1QfzAvI+OzpNZj70VAnUi438 L X-Gm-Gg: ASbGncuVSEHRFOdRA9qiCuZzGILA3v2GXR33vVwJNb6J++ExkBMKTOonp3ptzf3+kt1 hw9KbqzeVViIB0WXn9wIzeSvKsmm+mb8hmrMdSHB5h5XdRsIWGHGlCg2MEWgmr2gyqn2sCWUl5H yFUMp+W9xNll477wrwWF/18YWH0k9T7EhMcO0a8qMQicaIkVGFdFSXgU5DnDhLkcATuhunmiNcI ODoYO4T/Hm9kaoZZq94uKTQw+pw/geTNkMAZMVg2WJo1O150v/okprD5jESXwhxvgZqWsv6JlDe D1l5ggzW0xA5hkl917KqHl6G0gtZUJa+whRQnUfp X-Received: by 2002:a17:903:3c47:b0:216:3c36:69a7 with SMTP id d9443c01a7336-22dc6a8744bmr177357855ad.45.1745902827034; Mon, 28 Apr 2025 22:00:27 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 12/13] target/arm/cpu: compile file twice (user, system) only Date: Mon, 28 Apr 2025 22:00:09 -0700 Message-ID: <20250429050010.971128-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- target/arm/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index c39ddc4427b..89e305eb56a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -1,6 +1,6 @@ arm_ss = ss.source_set() +arm_common_ss = ss.source_set() arm_ss.add(files( - 'cpu.c', 'debug_helper.c', 'gdbstub.c', 'helper.c', @@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64', ) arm_system_ss = ss.source_set() +arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', @@ -30,6 +31,9 @@ arm_system_ss.add(files( )) arm_user_ss = ss.source_set() +arm_user_ss.add(files('cpu.c')) + +arm_common_system_ss.add(files('cpu.c'), capstone) subdir('hvf') @@ -42,3 +46,5 @@ endif target_arch += {'arm': arm_ss} target_system_arch += {'arm': arm_system_ss} target_user_arch += {'arm': arm_user_ss} +target_common_arch += {'arm': arm_common_ss} +target_common_system_arch += {'arm': arm_common_system_ss} From patchwork Tue Apr 29 05:00:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 885713 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp143952wrq; Mon, 28 Apr 2025 22:04:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5xIUzawwfKR+PveFeAPxtSbJvnhoY5XZfK5igorOPkyhE0/BCGDW4sI+eo8cbu81Xvw94xw==@linaro.org X-Google-Smtp-Source: AGHT+IHoo1UErYL0o6RId+vKdQvsp8ozTRcJQBf/Nt0q5DDJ2idvIEJAJRhpqTEVQbD4S+ZEhxub X-Received: by 2002:a05:622a:2592:b0:476:903a:b7f0 with SMTP id d75a77b69052e-48874946afamr29671311cf.49.1745903045050; Mon, 28 Apr 2025 22:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745903045; cv=none; d=google.com; s=arc-20240605; b=YZJKwsuQr4BnJ9N6LsENddneCvmem6VXLqU9vm/zrMYGju74fEPB4mPDPOOOjSi35X O8M9xn43kB7RQ+8ZKyhiISE2k5D/CbWsA9ZRx/dcYGNSm887GtNLYJVqF1mUhNAEzfcu YLjtkn4iKcnbZGuUTdn9UCPmBNkfcUv4U3jZQ/CWlgboabOnczqiKwCj+zthAb0Etmdz 1nwXsjZBlkykhaOyUeQBF3+3/8rqoIf00pfoD32kFKeWudw5Z+iPkqrfMPoL7J13Tpc8 zzxQlOjY3cGAZkWxb/OCGiiWFkv/2NQHc9geMmt54/zSXUthVsChp+jgOJ4ZXK+QSa4x HF/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ihSbjG4MVG/rPWJxnirZVcYWQR5uI9SkbcEMwpHCSZo=; fh=O4yhk4V8tvPJDnLnyAX1De4ll2cui8YfCZlHtNTUPp4=; b=aP76lHI+NG5+5fz5kuypwfrdvSu3IjBahETgl/692Vltp/oKhtvV3DNmVaTp2kL5px fpteM2FpahqUXmT2zpsKLdjzCWznPGtpH4B5hJO1auWziaJMXLbTrUuItu1lefosCBXL GmgqYU4cyPYEKeu8uwCGFg0ERya0HQ4mJ3W3Mez7jyBYJd7L9qyqLeYzv76Nf1NKOhKB F8mTkbzjjZ0C6CTqMANN06kxaJtXvfTd9uUYIeAX8KF42hZqVE5zMdhip7AArKBI5BxM bxp4DiyUMTLTb8ftA+J0vQCMrXMZsgz0vxcaiumZ4Y2ez5ZqwLB3Zt6Cg3gwVcnIB2Us zoKA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VpVb/4AZ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea24aa29asi119190951cf.476.2025.04.28.22.04.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 22:04:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VpVb/4AZ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9d6f-0000wU-NW; Tue, 29 Apr 2025 01:02: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 1u9d57-0007o4-MY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:35 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9d54-00062n-CI for qemu-devel@nongnu.org; Tue, 29 Apr 2025 01:00:33 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-224341bbc1dso59548915ad.3 for ; Mon, 28 Apr 2025 22:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745902828; x=1746507628; 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=ihSbjG4MVG/rPWJxnirZVcYWQR5uI9SkbcEMwpHCSZo=; b=VpVb/4AZ/vtUdpFDGf3OhCWDxVX34HjdFscz9GftXYLqQFgApJh+SV8dvSXip60eAP uAvNgFRVOXKwpl0FrvZLSFTKdcX9vesINlyOIeC/x+cOkNmDeyCFQf+1qm3feXtMIt12 xcIzBLzoS/dXfILZOAyNdxHXDOkI0lZVlZ6CoMfL0UFZCShus9J1sRAz0H9BuUMxdLV8 kdgFOQkF7qJoxpcQNLYf3M4LBwY77c7q3LMWAPly287PRrCyFEtsbojEFkvtF6SgPYEg uDUSEsuLTbQFoogCwfgK2tsrYYIQshf/ox9f/1y6sknE50rTJSLc7XpspITb0PLju4ZY KScw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745902828; x=1746507628; 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=ihSbjG4MVG/rPWJxnirZVcYWQR5uI9SkbcEMwpHCSZo=; b=AQ9omwqDQpgHsy9IPIeH57zsRomXnW47BJdPOPR0VFuEe2KhMcIgEcqhpsvLMPAr1g MfQJLQLhgTkPtcxr90aSwNf9MFe+yEs/EwvF1vKEeo4tjGAOJ82Q3NhNMUQfJB954P59 vyHfIfra+ESWdM6U73oKehSliWuF6xm+BIHj20mcxVfg0z6dv2N3bSwxE43o+tzVIvKw /wl3jsyjllj5vkGuuyVpeQJ2n+K4Yzu69POBeU6PTNZjdmQ1qJ3WOZrprIX4kA3JB47Q Fgkn5FEEoqh/2VXekLz9qAV5GA5zL9oXvJjOcyZqpxKghIsWWmQrVzxoEXdjQbogPlKJ iKrA== X-Gm-Message-State: AOJu0YxwQU4cBlmVfmbqrrlPjk2U/Wn3KwSaA3A0DuYMwleiNkiIGLhw 6t9oyvbVFRdqDHKIbPv8vrgeotz4K8lZuLF8NWBnr+5tHAgmCr3umlfAvd6PcjG8mOkd7aAaEdm h X-Gm-Gg: ASbGnctUd7ls+5MREuUzSOEaBqv0U0rmCZtVVZjDhcOQW806XXKr2qsZRR1oS+oDTKz lQA2jhd6eES2BH6h3SHJvqEujCQBB6IeGC/V0821SyI7uWTLua8YhlZXFdXULv2gjFpNfsgK4J/ 4p6WXtHVQtAvXQI0r/NEIS/mT9NGoVLvYieJap7Z2F9OW6M7oZSliNmuxMe0l3ZkVUNx/lpka1r rRy4hRlq7IGW5nKTSigyDejwRo4fZ+v8cazVd1GSdSaBSuZpGWIGlCtxr7lwpFuu2IKN+hsO0Gz QhdO2JsZKNNHz7eaoYYPqQ/PNzQEJiJsL2He8vPX X-Received: by 2002:a17:902:cec7:b0:210:fce4:11ec with SMTP id d9443c01a7336-22de700725emr25054985ad.1.1745902827904; Mon, 28 Apr 2025 22:00:27 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dbd6f7sm93004015ad.76.2025.04.28.22.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 22:00:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, alex.bennee@linaro.org, Paolo Bonzini , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, anjo@rev.ng, richard.henderson@linaro.org, Pierrick Bouvier Subject: [PATCH 13/13] target/arm/cpu32-stubs.c: compile file twice (user, system) Date: Mon, 28 Apr 2025 22:00:10 -0700 Message-ID: <20250429050010.971128-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250429050010.971128-1-pierrick.bouvier@linaro.org> References: <20250429050010.971128-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It could be squashed with commit introducing it, but I would prefer to introduce target/arm/cpu.c first. Signed-off-by: Pierrick Bouvier --- target/arm/meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 89e305eb56a..de214fe5d56 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,13 +11,9 @@ arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) -arm_ss.add(when: 'TARGET_AARCH64', - if_true: files( - 'cpu64.c', - 'gdbstub64.c'), - if_false: files( - 'cpu32-stubs.c'), -) +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c')) arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() @@ -32,8 +28,12 @@ arm_system_ss.add(files( arm_user_ss = ss.source_set() arm_user_ss.add(files('cpu.c')) +arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( + 'cpu32-stubs.c')) arm_common_system_ss.add(files('cpu.c'), capstone) +arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( + 'cpu32-stubs.c')) subdir('hvf')