From patchwork Wed Apr 30 14:58:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886054 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp899075wrq; Wed, 30 Apr 2025 08:01:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWw47q+iX+2WapUhyrLeUZcP1lbe4XMwu+s53+9rAND2i2lQ7+lM51wpI8oVuNLeFyPiMcgDA==@linaro.org X-Google-Smtp-Source: AGHT+IFLWlf768AjGMOEvCouutgY0bt47ZMmxU89yWOJgMbHjYOMCGO+tvmd1v6NP96QaeiuVkOt X-Received: by 2002:a05:6122:179f:b0:527:8771:2d39 with SMTP id 71dfb90a1353d-52acec32091mr2228072e0c.7.1746025294039; Wed, 30 Apr 2025 08:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025294; cv=none; d=google.com; s=arc-20240605; b=UcVuGeON1KddDjL89kDQi1mno1xZhSUHzhiL2oCfqaY8d+OE8PdvHGjRftmGe9JOGY nrRqMF1siH1FE1l/a4ESpDmeQWWUWgfIsu+MvVhoHQV5HL9C/LkKcLWVriy3y81FyfON GcRs7Jw0txTY1YG6ZLmEnpkO01MoaF8jUCZBf7y7DchWNyTQFBb0YgLTCQBb/2SoG3NT IzQCu6rB+7p/ncWySas0n5TxO29PI+aMPlMyunX4WzdgJIyhLDnR05rZ21//0QZIxLis tc41Cx6BXIs+iRMeYAHIUjGlLIIuNnxwijfWD1hlVlE977HD4v1S0M4B9I+PP3g0zBIS GLAQ== 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=v1JmSJqnxYquNU/v4UOEtwOcqbxnEb6aDiKyyBWqJ6s=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=V/e9mnUg3YP/K2Qc55H6JVLBLvgVHnMS7h0ZpnP2t8ZTTyAywW2S41Kk//fTurRUZf FQnqkXA8k5rxkVDJY1wCZ2kA3zSV0eF8hVf3xADV1tgk/9bsI585iybRPWAsmq1G3OKC y6aodA4FEbtugHPyv1zo92UN5VYv/uTVkDkdtbmnZxhVs4J1+3s19DFjUk+zVyjPu4mZ zc48bMJY2+yiaOyqmViEM9elhpkKeoznPtsKgURbxRDjcbvJvTdPXmFWCHwlktteYFSk j6wrRwHcUVedxXIpYiDS29R+h08wEZlE1wjV4wG75jcVND8fTxx34nBZWUR7Wq2q4Vf7 b2Tg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ciQuEBJ6; 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 71dfb90a1353d-52ace3168c9si485273e0c.21.2025.04.30.08.01.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01:34 -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=ciQuEBJ6; 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 1uA8tq-0002FE-5P; Wed, 30 Apr 2025 10:59: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 1uA8tk-00028d-Eb for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:56 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8th-0002dw-7E for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:56 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b074d908e56so5553657a12.2 for ; Wed, 30 Apr 2025 07:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025131; x=1746629931; 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=v1JmSJqnxYquNU/v4UOEtwOcqbxnEb6aDiKyyBWqJ6s=; b=ciQuEBJ6+6NTDvjgFSTEZN3Z1ln5rQbVjIYvK4p1XlaovYWnFb8be8gfb5SOEcuzUa r5pL1wv+01Xno0uw0dkYT4e8eZ6sN3vtnY/O/J1IUmhEzOwPdWDbVS/aaDEsWzUQKF8J ubsFyciTowsok282U9IX4LBedvzGf0dNGrKYgftIDcfr74XrwvUgALxkwu+9TQZopwDb lGERrbKNU3zvFE/UYAh8wV+jfP5E9NmbJc3VAiJlb/fxUMm/iYSf8PysCZF9lU+mVnEO DrGTI/4kMs8xRO5BMNW0hebr0RuV7OlCUcBkLtBf0BhpQZ4+TOReaj3kN1IIEs8uokLF AN1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025131; x=1746629931; 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=v1JmSJqnxYquNU/v4UOEtwOcqbxnEb6aDiKyyBWqJ6s=; b=n6vj66luwqiAg5xBbQtT3dTAhBsZT3klfSbNWngsxIuf3qNVbokp74ui54vqhGFWBr J+sBpp3l6Y3hNeQUhXVl7eyQW+qwWp76w1mrdoGo6Ptr3ZUfX7KicYa8Ve5W4oZ2AHKE V41kq+9R3xitSv6gZ6PcL35vP7PU3iYf3Za7DH3m/DQT7OvudN22tjBcU/UuEdVPIR3L zrGgaXb4ZqG1BdwSCLZBEHRBCkWSWLonaxeecu8GKbf7sjFj/y0jjAATdA6Lvu8vHgDp btV+lGyutrq5Jqu89+HQ4RKC6nh9Rq4V+DmmD3uejylFMBwh14h84r0V5ZhchB96KNLs svzA== X-Gm-Message-State: AOJu0Ywx8Q3dUa7j+d4WXzh/7SWMbbLGtLxdwYY9mVeYbmdXaZbFJgOT AeXPg3p4swhZXnyihbFd3OKdnz8qETPMpImlbSCLksFUHFkVhdwtMrZuF5rhFwpOZ5EsJ9U/f9v B X-Gm-Gg: ASbGncvLGaW4rNFhpURKP+TjjJtYX2XrnIpjCDGzmopJQ1wj1ITpCIoWMYhnpielXt/ 84aX9sIspkwxuGnuThJ7oJIOpe3M0uz9ap5yaKtSQs/hiG475FsfkwpPWC75YrqXEZBRDHaMud7 38JuSHEtjInYSD9geqaGfJgdKAoAsSmtNW0wHT6c9k3Zln44jCvHworPmLWy1ea/qtzcpsSoNwy qghkQ5hiF0X3eRh5FeODukDw+YTCDLcIjkFspgoA7nUuPRxrYziOdhSyM7jRaamuhrOVoaCjOKR h/R5vQYWZM2RU8fspqZgcBBxrHwSf9wlhJbLhgaL X-Received: by 2002:a17:90b:3504:b0:301:cba1:7ada with SMTP id 98e67ed59e1d1-30a343ce72cmr3932692a91.1.1746025131606; Wed, 30 Apr 2025 07:58:51 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 01/12] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint Date: Wed, 30 Apr 2025 07:58:26 -0700 Message-ID: <20250430145838.1790471-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x531.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 Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier --- 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 Wed Apr 30 14:58:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886048 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp897582wrq; Wed, 30 Apr 2025 07:59:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdwt6Q6pVghqxbz8tu9Z757mXpNdRaCISp6adtCq9p7E35ttOROGdu82CmI7RA9fY6JpnY8Q==@linaro.org X-Google-Smtp-Source: AGHT+IG2K3+Zu3rSkxU8apmP+XVQPlkBa56qimN81WCBU6txZHcJk1bF8kdEv2x3OIVqZ+JdFpko X-Received: by 2002:a05:6122:1809:b0:526:1ddd:7603 with SMTP id 71dfb90a1353d-52ace90693emr1977806e0c.0.1746025166337; Wed, 30 Apr 2025 07:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025166; cv=none; d=google.com; s=arc-20240605; b=M8biGNbZ/utr3jxB4jItAN/yR4s57Ohga2fp6SMxP7WMds7+lyRaR0xrQ3TDC09bNH DRbAsNAYfCF6ut1ryhJ2v95CqjH9fgieDdqP6lrcvT9mfNhuVmvX0ht6Wtt07lqo9VCl oy+g2T4BFj8Ra3nWxq8G7N86N4vD9LIwWBFPT1KqRbRxzJJvVdD61FpPKx0eZ6GC28NX gXS+RDMdXJ7IZxK4+frDtTndkFREvYkw2cu8CP7tNd96GmkqDrvE514tin3iKtixz83w 43XewRcCNAJEHAPWeihBTxBCwpY+oJ5KVtiE25F+rTlNzz4KbOpuExk3NHPaUY6/RkwS TXnw== 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=fGiNi7KD9gyOgMyKCivUKJWXpCWPNSCcBCjqGbD2GJ8=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=YSuwVieyYP8ws8pRPuVKFl31yRk3xC4t2FZnFdjr/7PqqT5HU6dOZa9ReUtDHHR4/3 WXXyMldid/JnTu6vI0v600tSvwWJDdER7D9S5o0DFSke3JvKSHJeV2IDX2wFYAXysmpu vE0H3Qrqef597YyCSbQaJjiI7uEcYmf3y4g0Xm5ceXSnH9XkONBMiz58xi6Jz5NMxZ9W 9FoP3Y4MhwPky+GEunblhx54YsS90LTSDs5h71xS/0KGUlOjlVCxAT6lMYyEBHI1wDze Z/svhf+T8QMLJVY0OX/bZPY4S/TDlQnJnFNMxT3hcFJKXZ0PO1tmPCqhfMiBza6ag3gy MtdA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxW7mP3V; 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 71dfb90a1353d-52ace4dacdesi539026e0c.127.2025.04.30.07.59.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:59: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=lxW7mP3V; 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 1uA8to-0002Cl-J4; Wed, 30 Apr 2025 10:59:01 -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 1uA8tk-00028M-9I for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:56 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8ti-0002e5-1X for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:55 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-3012a0c8496so5948363a91.2 for ; Wed, 30 Apr 2025 07:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025132; x=1746629932; 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=fGiNi7KD9gyOgMyKCivUKJWXpCWPNSCcBCjqGbD2GJ8=; b=lxW7mP3Vr9qapPWNSdWMGjABX0bDsEumAvM9F4C17MYK40xgOUhZNuaIUPtQD8gz1O y44LkQFcRShI4VKa5hV5GA+1Y6lwGu6grMwYpPLU9WeEUa8Kbg1luEMV12rsikLb9EHF obKCRZzz8j1GOXl/re3u+jSPFim1P91uGbFvS6T6TG0igLwLstOnIktV51JsjNwlGgtE LRGRfZrIWn3YkLOcxTplZqsG1D1CIDAErMOv+50LOsUbNi+8wQ7fNxAowFd4DoCoIUSx bk/LPDdyFwPVFbD03Qoa+v1ZFgP2G+hkY8s/Kssk51ZXj38M0I+bRq9fefvN1lfgu1xw O4fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025132; x=1746629932; 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=fGiNi7KD9gyOgMyKCivUKJWXpCWPNSCcBCjqGbD2GJ8=; b=XrBMqHt8KyUu4iIKvuaSskR9AYCTfC56K0xk4J0C4BOxg2P43rgwrIUSCpu/B8BkNm xWTBfmD6iMF4xwsUKzXmeU5Zm/Nr4GPDZvVA4vXOmjY/8dkks2TgdAQLlMPCLxVnqhfZ PmFxV6ldMi+dHyPmD+VOCv8lE3JXdHmIU/Izmn4DoUusLWmsC7KDqlzXHmdadcBIUezk 9ikqSXW5jdd/KRl+mQL8x1IBchZlA8l9j8mA+INuplRVeZ6HuYcSOeYgE65EWY3Bpd5l CBW3kLo+95s2CHniz7VAMm99FtVNs7QtWNg9QHF3EXY80pKyj6XX0Hmy+kg2eFmN8TOA K0vg== X-Gm-Message-State: AOJu0YxE2WkLvt7B0KW9m9XHFrlU25ep2/J5a1oyxA50i03ON9yasbuX TLbmdkcdpv5VY5j8bDhsZmoD5FI6tv7WTYHvWRkq0glUKELQfKbyJU5++TGfoaLyBuu7aA3sEl4 E X-Gm-Gg: ASbGncsNmAEgD/H4vZrzCo/6/+ls7Wq8DR8COobnaa7qsB2KNd2+PX/7fRfs7zaXWsn 4yi94my1JSU8Cxk8TdBRa5igJQAQ3l5Tarz0w4wzyAJ3tplw7Rov3hak5Oe2exZy+rWzpfSwRkL 1FQyFGSu/SZijgll993Pc3Xc21brfzW9R2R/EYefbmpPBp/k0NYg15Ti8cBlfdZhcOYccmlLqcE JuGblYyYu2md/iNSqukx+5sh/4Cq+wfBWai91od6VtrNUjXZgXT4Z36SVyx9JtiAqJDjaGsYVof mV1gDUbPp2r2xDeiKe2JeQB1bA6vevnrFasAwQ3D X-Received: by 2002:a17:90b:514c:b0:309:fffd:c15a with SMTP id 98e67ed59e1d1-30a343ecc28mr4110023a91.13.1746025132462; Wed, 30 Apr 2025 07:58:52 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 02/12] include/system/hvf: missing vaddr include Date: Wed, 30 Apr 2025 07:58:27 -0700 Message-ID: <20250430145838.1790471-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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; Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- 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 Wed Apr 30 14:58:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886058 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp900677wrq; Wed, 30 Apr 2025 08:03:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+s3JHOOXHDguLyHm8WyVmlOb9xbI01HvUIvNaV7RQC1+s79Sn8v8XGBTlmBahD7n8k7N6gg==@linaro.org X-Google-Smtp-Source: AGHT+IGJ5uAK9Tzw8iHfxPGfxDors2LbonBiUVbkdvHfKwQZUgcLeYeI2ZKCrOLhkx94cSgushjX X-Received: by 2002:a05:600c:1d8c:b0:43c:f16a:641e with SMTP id 5b1f17b1804b1-441b1f2fee9mr28737235e9.6.1746025417936; Wed, 30 Apr 2025 08:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025417; cv=none; d=google.com; s=arc-20240605; b=W6aNuioj+Vs7Y1Xg0WtwRSYadfbgzcK/XlWLwP+4oHS8bRhhY1gfLx8MwygOUafEGS cOTCctnAOOJK0RH99EbttY8NzpIiEuWhSGq+mbtyotufEY9y3EKLYM3tN9DtRRtXv4CZ V1h1GsRnFBV5fn8Ml3axAgH6EMzwRAb0QCZ4UXrYriD6VR9Udgk5XViveX4bTgPntIKa gRIJwxFQ+Q+SrfTyGJi8esZC6cmiBWpHHrpvvp622a6njt2RxbWUtwB5XuGq0wvKUG00 x8EtDHxvyeRps8XdNQE73x09C8x98IyIsKBTamkAx/CY8jCQvL/Y4SEutxHsVCzeajhu CLxQ== 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=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=QoAEhuqyXt/FRaZiHJlPN9Yb50ld3h7tE9/iycd8nARukG6gZB9wM+Ndfg/+ne4/8d HDWIUp6WJ6Qrss/M27Vls75kyNcS32QJaj1QrGliymPra/CYk3HR8VqEOsjl0zQ+Ibg4 CWp1cP9hDkUXMY9LB3iGAGXEQLsMUJlP8pOB8dL449tVmumCzP72OwqnHL9N5+4w7z4S NCpDz9pYQUEtisTtlCGY5DlihEVrklKDuNryyFy4aP2LfpCVyyCz9FGWqsR7nEg9UCa3 nmyyZN9V60AAJa5zIIhjq904YyEozfB6IjCc7S8bzoAbs2hWqRTYNERJQ29p8Qfhub/q PLiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SLk68ec1; 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 5b1f17b1804b1-441b2af2888si14172315e9.110.2025.04.30.08.03.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:03:37 -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=SLk68ec1; 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 1uA8tu-0002JR-Ln; Wed, 30 Apr 2025 10:59:06 -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 1uA8tl-0002BK-P6 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:58 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8ti-0002eG-Sg for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:57 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b12b984e791so7043424a12.2 for ; Wed, 30 Apr 2025 07:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025133; x=1746629933; 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=SLk68ec1MROp2P66QANGDxnPQam0wPBuLB2wSMgcYQr2sKC6W6E9XkQ4CT+WXx/3ly aaqUTeJDeHlA6ReLIljUKPXvW9cqargmkn/MdiiPIrch5DIIROBSvW3u1Kvv+26meXDG 8P8tm4jA626yodBPFqaO+E8SC8s5Z/JlJIc1BMn8a6E7i+B1jZV7mqIiA6uCdA95KEDa ThCk3jzMk4ywv0+ojFOr/gu0xtecuEuluH6lMHCfB7X4ifhtLudDJIrV/Lcypye3p5sL ctmtODg2yzXT4SN+WDSuN4hao/bXyh8NAYPPGegAVtQl/83+mmR2HE4tCQvdtWBOnZlm kIlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025133; x=1746629933; 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=fK8MhPf/5uOKtya7aY33dtxVt2YNp47SZLZCEao9e7ZF7pKcLY5TcgaybVtbZ/1agC irzL0BlIIEbF+5M6nIhop8+a7ce597c/7SBVcuMMXQK1c2W3DsgUX8IJzouXr1AgZiY2 tsZ2satV5Remph9o0oH757AEzLOLG4hhSiM+LjddLgg3FU+Vhw9lHC0p16r+XvBZxMk1 A5QRR10ROLJ0bHJxk/HTikQKJFwWqubSUc2/irvBrrTM14sNMjze1krz3dFNmAoCp74I i7bJMP+FT2roTINOLCz7jGpBflgiGOpKyUg6evZlTX1OTy+pkEUg5TlJOE4+65n4fyfV XNOA== X-Gm-Message-State: AOJu0YzKdLGX1sTjlKWKZUET559yHnVSVrTu/s2IF+d/LgWTLOgc7lLc sGVkt/aqA+r5NjMDewu3AKoPvCtmbuWnIkTdMUmHL9xICrtM2OcZpLz/AEQuRB3eGWlrFDu0aW/ L X-Gm-Gg: ASbGnctdW2IeCSCHOcUU5cJVwB8RKLcEHZCOXvizDCrFK/4kjTTlYCCPSJbmtnon/vo hWcIw4UwJD5RcbcnXCRVPEJFOG/flfdJ1a2A7rgUO23cJIMqEOQXuTaRIUs77VeVY+wmKMl7iQo nIHCWYhd1VKYfDM09iikziC39Nz/ny8L59HmLt3O2uRNxR0LrkJha+M5JyidJTZ5iySPSlSJaF4 zm8u5xdGISPybJKKol8T6nGkWLinyTBFtmQsTH1WDaKR278sNacqNhnVG8qG+JQmS4Nsr+m9M69 pTZamfKhqj7VJUfZHu4BSRucZJfe/G9vlDNx0odL X-Received: by 2002:a17:90b:5444:b0:2f2:a664:df1a with SMTP id 98e67ed59e1d1-30a332d60b6mr5368225a91.2.1746025133341; Wed, 30 Apr 2025 07:58:53 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 03/12] meson: add common libs for target and target_system Date: Wed, 30 Apr 2025 07:58:28 -0700 Message-ID: <20250430145838.1790471-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x534.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 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 Reviewed-by: Richard Henderson --- 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 Wed Apr 30 14:58:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886053 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp899028wrq; Wed, 30 Apr 2025 08:01:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhongfauV+gis8/IDWPXKu9DlxmbSD6zfZG6CYLTl13aXMZBgaMEH2LQTr0atvz6JxEs2fPg==@linaro.org X-Google-Smtp-Source: AGHT+IGiyth6NXXzndsj8h19KZ67cO+0BnE+f/ly6If+I/akdk3Y/HcK7iptv2B0/PjA4XZU5gFp X-Received: by 2002:a05:6102:26ce:b0:4c5:1c0b:4ee9 with SMTP id ada2fe7eead31-4dad4a61489mr2048449137.22.1746025284398; Wed, 30 Apr 2025 08:01:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025284; cv=none; d=google.com; s=arc-20240605; b=QdMMGL07U518NjdKf43+TEyvdQRelUcf03B+9cHQQiXdefaKeId3NauWdcCjFTDt/S OHUskH9g3H2YfhtoHpWrd4jpkxGePbYDweEBIIH59j9MIEXi8UNM8zWQm4bsmjN+ctzn 2+tffmrFpRWnNum2n+78agA4EBAvnNrrfNIvYc4R8oKZiA8gRID+NoqQaZJR7NQKpTCA 2fFoDdRABhOJIlF4C/4tXbhc9y8r4WqYJtj8Mp4FGDp43IGqQUF8LfC6w1iuLRLdpw+g +M3RPeCEiWklq+7T3W1cj/d2wwqEMYRT7MHdtXxkt0FfTWdR+LrzOda+X6DyYZjKI34F Kp0A== 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=lgiqh7bhRD5cMq/BEBKsGo2haYh+WuQTB6qucvXC4NY=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=cF6KFrHCQul3Z/IFHepHM6y5tgmQIjWBpbhJq+gqI3u8ZVuAgoWNw1MQIEu878yRG4 7VSD6z8q3V/kAgx1dFjSqCkzUQK9G8sjJB6/0fyxymfVaasaVDOumE546iuNJII/blDj OGMYbbd6oNw16EIXlV4IWbKLC8DOseFJQNlpVQwFY04UaBqqTFLsAUgA1PjdVU5mdU0A c8KjnTrtWzhSSjAp7UrGvbvzdgw2hpzczIV2UcyG2jIiPY+aWxrRk3OmUXTyujS9eIWD Q4/otEf2zcyWyzosI0+ledwzguCPz2PBbgdbssj9iwgOg/T6xX1hc1hCOivPf5a6UK2b fX2A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Vg92JdSm; 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 ada2fe7eead31-4dad4296dd5si449045137.571.2025.04.30.08.01.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01: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=Vg92JdSm; 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 1uA8ts-0002HH-AZ; Wed, 30 Apr 2025 10:59: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 1uA8tl-0002Be-TW for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:58 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tj-0002eT-Ey for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:57 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-3014678689aso6265a91.0 for ; Wed, 30 Apr 2025 07:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025134; x=1746629934; 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=lgiqh7bhRD5cMq/BEBKsGo2haYh+WuQTB6qucvXC4NY=; b=Vg92JdSmGs+zCSOszLETlz1D8zmkjKlmISgfnAImNf8H4SoRngxqKfJcKerEtSw5d/ OTmWuPiCHdmUUQabHK21YYNO+/cTFm1agetWXdQ6KXArJmprQcb8oli40H5XvSNM7n7A nZJl5BtN+tNkinv03kqE95fdXkDnCNGr6JrjAvkq26hic+N0frPmCyp/rJcoMCulLh8O y3X/niRMLmWwsn2AZhmpA6NPs31eU3eTdUxESC42QvIkfKMOZ77cifUleWRKnbabv4hq YKI+H7lfXZ+6ooY+cdlDCzcM8bTVEf2dnReDJD0pJZ27mQIenQQPjFu1hoo3xFYxLts8 Jtog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025134; x=1746629934; 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=lgiqh7bhRD5cMq/BEBKsGo2haYh+WuQTB6qucvXC4NY=; b=vmO3AvZ/2hs5H2yRvwSmkCjyvy1WF0v/nCR2XUN0tFsqLGVi4i3ve0bv4qZpJljL6K xWMr3oWgb35ZBOO9NpsnXSxXkGjx1n0Ems/lhAQI1wMtcKnkRa7FAGAnY2/YEeRGSqmJ H9aigb7R5hXKdVG90PG3D7S5CN1oHWjPP7Cr1vEIYq/vJwazx5CnwJXjPYw/A78YzsCD YyIpA0tzpTTK/0a6D/TbnaiLO1zoVInfKNHZDt+0u5mRL0MJu09eXfc9k712PvHms0JA EepABRKLsAH6T7sQu5ocgtIx5jLS7v8cAis8L2kc67v3i/39GuUuKG/cvhUbhAnXeS0G FW0Q== X-Gm-Message-State: AOJu0YwRetPsWT9fFEbu4wSOr6w6+lR5u6sPDPzG5Q5sL68D3vti+nDb 8skmS4LcdSS3aqBfOiUpkI2xNNBYeusSR+dG3ju0KXPeYZz+QqIftF38htVLjy8JvisgtoZMbKa t X-Gm-Gg: ASbGncuZZcT/+7y2CHQL+QXYb1XbVkYxbYqHiYX4U3rsWAovBDK5tSRWoKbLCgvjiSn mXVOXEAKCotLF2dNvHqFrpnbuDSIazjk43cbc6miPNFkTnsiA/Gfk3KDLjg6t8zxqcYyN+QQgU5 +loUKlJLuuBI3q0zTsE46KL2ICEVmflC/oRjNjxihg+CtB/MFP3Lr0w58mtTOHuguVNKznZu6R2 yDkzw7r0eb8xwXExrrDYlxiv3F+RRfdJ6MYvLVmsM+8NByFBdu9CwVShQqkAi5qAEvEo8Y2U1+j YRr7NNnLVoubl6Q+PTHpowDPF9GHOI463JoOrt6Q X-Received: by 2002:a17:90b:514c:b0:309:fffd:c15a with SMTP id 98e67ed59e1d1-30a343ecc28mr4110169a91.13.1746025134157; Wed, 30 Apr 2025 07:58:54 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:53 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 04/12] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Date: Wed, 30 Apr 2025 07:58:29 -0700 Message-ID: <20250430145838.1790471-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1033.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 Add a forward decl for struct kvm_vcpu_init to avoid pulling all kvm headers. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/kvm_arm.h | 83 +------------------------------------------ target/arm/kvm-stub.c | 77 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 82 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 05c3de8cd46..7b9c7c4a148 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 +struct kvm_vcpu_init; /** * kvm_arm_create_scratch_host_vcpu: * @cpus_to_try: array of QEMU_KVM_ARM_TARGET_* values (terminated with @@ -221,85 +221,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 Wed Apr 30 14:58:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886052 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp898873wrq; Wed, 30 Apr 2025 08:01:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJ/wPbvoXAEyv34Lp5uIf1TWf1TOY0jZky0398dTLjvYBIrmMr7QSLWTuiVWh4KfzpAsVwSA==@linaro.org X-Google-Smtp-Source: AGHT+IG0COl0hJPyTmPtvyBOn8JdAOwZ98kZD7fWzu0fBgWPG3Pz/o3c4o6w0buH8Vx0XbjUgDpj X-Received: by 2002:a05:6122:16a7:b0:523:7c70:bc9c with SMTP id 71dfb90a1353d-52acd783d36mr2739787e0c.5.1746025274392; Wed, 30 Apr 2025 08:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025274; cv=none; d=google.com; s=arc-20240605; b=lDCjaUA19Mz/V1naMAsU89B2J86s+jVVRddOy+f4Vzbawcn1U1Lh4woQvWMB0+jN2V zqmJuBIX34EyUYN4mUaHhKQTkeKMG6zlvDg7DMzfnJokpo8Yb1IQUbnrXi5zR7WdvoS1 dtdiMPuUnpODF9SvQmafXfsuHeT6sR9lGBT3eHGB5EpD1TNlhlO6L2DCtrSmLNQRQ4Yt 9m4+QxJKjZ6J7XpjcpS30SaWkmzp5XyzsnbEef3J+1CJQ1wUo1edmnyyg2YL+OktUzzx KTtDFWfe4IeW88jV0hblwzn3jdXxj9A4GQDYoAoD7LZ9pvJhWN0IphUZofj4GOGFes/b C51g== 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=Bo98cnrbBzZhIVM6McCtIYbYMjUhtLO9PiS/H/WvU/o=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=GVfJwUitiV3zrK3c3+z9n/6LGPOFeWT9u484jgtAGxIpkUBjIBp1T9I/be5YuH31ot ADLSfj+JTdVReDuIqpIcJyLjD1pAEVafoSVQTkBJpC4i9D3hG5+ZhdXRd4oBvD3SQS1N ES1XxHz21QIWg6NKJ0qSUj9cXaDasHPZutWHnS13yf4yB/SAp0GOwk8+U31muIqqCHkD ekbmFET9zfIVWe42hTHZuV2p0NFrsb4SdmjqngBfTaY53rmkeQGKUNrdyDLeyPZujHwE TN3YiHERcPAmohMN/z7A2gUrNH7AMRWiWpHB9W9fmBJm1HVPVereI3yX9dRkGptVmu25 662g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FGTfgQfV; 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 71dfb90a1353d-52ace355a89si489074e0c.67.2025.04.30.08.01.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01:14 -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=FGTfgQfV; 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 1uA8tt-0002Ia-7T; Wed, 30 Apr 2025 10:59:05 -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 1uA8tm-0002Bl-84 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:58 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tk-0002en-Ja for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:57 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-879d2e419b9so6682988a12.2 for ; Wed, 30 Apr 2025 07:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025135; x=1746629935; 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=Bo98cnrbBzZhIVM6McCtIYbYMjUhtLO9PiS/H/WvU/o=; b=FGTfgQfVcXmZIjT4PgQnDU+mVzNaIREELwYG0/Cw6XW+qx23oNSjLJCPsVKLj17Qp9 6VtaH2v9Z3gUiQdJMnQQH58UQj5hscUy0LG649mM2mx4JkfTMn8StCV74OMabWdNGHHp wYiSJnLjBMvMxTYyi5io0ufnokLOU8v1u1YWrezudKng/7Z17iiqeKLnJXQYo/LU9h1n cPD3lNeUppGss6/YvaQksqusZ59jsn/B4i8czbf8VRQ9ZWPb8loF8TzHSjb3XMS6otJG HqrPvBZ2S+daw9uDxiekscUXB6fQN//XHiD2ukbfgcJMSuPxcMGzObJzG+dWVp39ZmwW DXjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025135; x=1746629935; 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=Bo98cnrbBzZhIVM6McCtIYbYMjUhtLO9PiS/H/WvU/o=; b=GQh1gEE2dtjvMUT+CxX/FDBH7wxELvqZ0yV2DCMs4w6L5FtIjPHfGV7WYaEclueXvm MOTdTEJtmJYBx3Lx0qMdVtl3XlRU/yEGPB76GbIoX9RSInKQCD4ChhKn/FRIkkWiDeBF ef55junVWQUCr37c+JEb32q3kzCrZUqjTaSXBSvPe+A3Qj2SxzaJmGNlLMcJ9TmULbvN /tiEfzz9OWSW72R+oRJNcyrjSt3H8tBhk44HrhyIPPijWSjTZt/rdsTUyQIZbV/ae8tV +91J89yfcvvqKE43SJxn01GKQscUKPvKdfgb9cC99R5m69AbZrHjXEQIEmSRaJ1meFRx DgFQ== X-Gm-Message-State: AOJu0Yzmw7q2eSnh+NJ2XXbhPGPwVvwz/DkaAtQTpaCCaQfm/1ET0oJc UxJKbkPcyqVKxhiK+0UwM7DxZZsX1imv7NqJkpZFXBzoL/iZFI5vEw99avvRCkdeB7vV6eMqxhB 6 X-Gm-Gg: ASbGncss8uKVMs6he7RlSlqh5BRvjtLpOiOFzPk0XSP8eimTCRIJ7Ed5dW04R5TRg0e TTrenr9qdVPexFw/77Gqjp/Xtet9fYI0L8Wb1B3DoOmcAriFj7OLJtZ24hXmxdnzFCgAAqm5kOw rYECKxSmk4D1zlM+Tr7ERplTI1YLlPXUqfJ/fUxBYN8TqVrYcR4TlCOv+VlOT7gpnXxmlkLHesU rg0/P9XAywZLxT06NvvhRo7t2pSuAsrKTTeJDAzzTFGpx0vsteQfvLH9xqPj+ZJpln0089m8NaR /0N/jdvbPBIXqPc8QcMK+x14thCkM036zoY7rakG6SRUUooYB28= X-Received: by 2002:a17:90b:2dd1:b0:2ff:692b:b15 with SMTP id 98e67ed59e1d1-30a3336fa2dmr5823412a91.33.1746025135001; Wed, 30 Apr 2025 07:58:55 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 05/12] target/arm/kvm-stub: add kvm_arm_reset_vcpu stub Date: Wed, 30 Apr 2025 07:58:30 -0700 Message-ID: <20250430145838.1790471-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52b.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 Needed in target/arm/cpu.c once kvm is possible. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/kvm-stub.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 2b73d0598c1..e34d3f5e6b4 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -99,3 +99,8 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) { g_assert_not_reached(); } + +void kvm_arm_reset_vcpu(ARMCPU *cpu) +{ + g_assert_not_reached(); +} From patchwork Wed Apr 30 14:58:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886055 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp899236wrq; Wed, 30 Apr 2025 08:01:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVf6wF8e2rkb+p3ySpWfDahFC/BVEBacykKzIpr65YL9/LE3G7iBIS3arRwjFgFqcQccJ/bsQ==@linaro.org X-Google-Smtp-Source: AGHT+IES4LD0bBssDSzYiSLJsfidyp/gS2i+hcYPhrvs5siDAx4Ld5d8niWcz9Cs20w8Uczl6/8L X-Received: by 2002:a05:651c:210f:b0:30d:c4c3:eafa with SMTP id 38308e7fff4ca-31e7cff0d07mr11935431fa.7.1746025311733; Wed, 30 Apr 2025 08:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025311; cv=none; d=google.com; s=arc-20240605; b=ba4/FzpPV7R45UfmgdTkHMybdsZd+wqQmwhHtFYZjVjXnNt4c/bygJZcW1nHfKU4WE f4HplcWwrFD2Uhtl1zpW1OrEyzv+S3Y3YLc0vZrGCzPFe0iM9+0H6YZlFok0eVBjawZx b44aybMVsOVjEP5rz2iNtsII4GFKpmZGixCJuCMGdYcDQfgKdfRyjTYZekpGbNhzbP7N 2Qxq66jyKz71VfIN5qPaV444qcs1uL9hE+WkQMkmlE27+Xb6PlJ7YlA9cW94qgJ+eUNg Pti8X69BGJiID84w+5x5MaVCd7kG51P1i8jwasN089TqXsT1JyE/QlWm5srYF5QNjo5E /PbA== 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=lAH3cotbobc3STOrrKlAqY2PJ1TCvwqHDV7tuHZjTZ2tchDnP08OpJpgaew/tdd7q0 mCJ7jp7IsirBf+Obn0vgs/6JwPPMTANgWdQ0N9QuizV+Z2DaUVl3YDN9mlOMC/bbG2mJ eqvAwTBk1MeWhpoqmalKZSpoJj0dMgt2rBIgVPTmJOLGUmryf8rCvP1JQUROXzaxJTAl KXa2SoGRQ5ujbhBO8D1dMdBa1N9Y2zCVWBr/LjdQP2ErNY7FdtWgj1bIwJiqWAbmc1TD qXKkyRBOgBj8RzTb7W7uHALPiKYgKlSydXSxNcOiQW+e9z+8fliLcK/VZwqPWeADCh/n GlOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q5R8dlZ0; 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 38308e7fff4ca-31e959fccdfsi7392591fa.285.2025.04.30.08.01.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01:51 -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=q5R8dlZ0; 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 1uA8tx-0002K9-CD; Wed, 30 Apr 2025 10:59: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 1uA8tn-0002Cb-7i for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:59 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tl-0002fI-4z for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:58 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-b061a775ac3so7127533a12.0 for ; Wed, 30 Apr 2025 07:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025136; x=1746629936; 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; b=q5R8dlZ0mTEJnmI/p9CwaweAFcufMaGurUJUwD8lkfvAXuD8bcCOfgyjC5rRRk8ur6 ITyt/FIg/A36OwIQj5IZ2eOylOeCf1QeZ9hWV+n5gzLqQv4/kPY0xceUTmDv2jd50FCV kkQwIUp1EaHLAN3TRr8mH/SO8SXuhNRnx1EuFRQJigztUap+sJVaaJwPdUBWl6qiStGX I9kW71WnoSr6ofc72uEa0Ht9sFCzqmYvs2Am2IpgVx6wV8AIsQdV7ontty6SJnoHCEMA MJjixKyUxJQ+TtmXzxsEYheCbnp1ieX4PMSXRElLcqVA5HUJRgnhvkFYchu/mfTbOcaf bXZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025136; x=1746629936; 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; b=Vx+LqNnc0fKBpX35QdcXUuesCo1VFG7V7m0FtIc0uGQj+tsfg5GYmiEo7CQv3r9cla G6ZfNpqILwHwXnGto5EuqFcYNPX3cx9KYoul0bWB3mbMNulyUiOdoAh+56bbbrDI9N1T QFIzumFm0Cl7KVppoDvVBonC29jZjTC3m44smPt3+AZ1qOhHM3a6X9uvUnY72fA697Hh 8Di5MGZzAbyBfH5f36WsrdD5xDu8dFkO+WZJsQJBNSTL5YKdxtio79iYoYHG2xrKWJnJ X3k7xOIU9fUAwQsioC3hKkMnSoaBqml2ocXTTviKdHPS8WVZQjwwrudDYIPQjkKQA4IL Zc1w== X-Gm-Message-State: AOJu0YxL40ko1Mm0kFGe4HNAvM46s6mMyYqW8kEUSpwbk+WqYg+b06Ch QX6F6PY8+sBKFFOQo8cCNdOa1ng5h9ObxO3BPnOkHudVKBhq6iQQe/PB1UAKZZqkdIZGO4rpF/8 k X-Gm-Gg: ASbGncs3x9FdBae1CbsouBLOUWOsj27xvg+bYyY1uODXzq1lZsSWP9G3QRizJJ7GYN5 w04braQmXp64GQnoJ8vjgdS8Ub/Ib1Tr6ZnHHr/XxAf8PzCjsOq8E+tcqvEc5NyKGA/+yrNM/2f uancPIKuzJ4QYsHVFbrRmhFYdG4GeWlv5aIsETI2Badqht5X9Ys25vDOpWKAEG5dVfHO6m+t/Tl 32S0wDTzSxqFzM3ixVQRphhkVs4FzLuktViMPHslRWY5wHTlnvCqHQv+WA89PK24yBAVtC4Wdl0 mfYkzSWImgs3eV2UM4afNAjY7a0vs/EOZePDGO29 X-Received: by 2002:a17:90b:3806:b0:2f2:a664:df20 with SMTP id 98e67ed59e1d1-30a343e80afmr5103795a91.7.1746025135869; Wed, 30 Apr 2025 07:58:55 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 06/12] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Wed, 30 Apr 2025 07:58:31 -0700 Message-ID: <20250430145838.1790471-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x536.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 Reviewed-by: Richard Henderson --- target/arm/kvm_arm.h | 2 ++ target/arm/cpu.c | 31 ------------------------------- target/arm/kvm-stub.c | 5 +++++ target/arm/kvm.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 7b9c7c4a148..d156c790b66 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -221,4 +221,6 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); void kvm_arm_enable_mte(Object *cpuobj, Error **errp); +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level); + #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5e951675c60..07f279fec8c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1099,37 +1099,6 @@ 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 - ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - CPUState *cs = CPU(cpu); - uint32_t linestate_bit; - int irq_id; - - switch (irq) { - case ARM_CPU_IRQ: - irq_id = KVM_ARM_IRQ_CPU_IRQ; - linestate_bit = CPU_INTERRUPT_HARD; - break; - case ARM_CPU_FIQ: - irq_id = KVM_ARM_IRQ_CPU_FIQ; - linestate_bit = CPU_INTERRUPT_FIQ; - break; - default: - g_assert_not_reached(); - } - - if (level) { - env->irq_line_state |= linestate_bit; - } else { - env->irq_line_state &= ~linestate_bit; - } - kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); -#endif -} - static bool arm_cpu_virtio_is_big_endian(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index e34d3f5e6b4..4806365cdc5 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -104,3 +104,8 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu) { g_assert_not_reached(); } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + g_assert_not_reached(); +} diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 97de8c7e939..8f68aa10298 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2468,3 +2468,32 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) cpu->kvm_mte = true; } } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + ARMCPU *cpu = arm_cpu; + CPUARMState *env = &cpu->env; + CPUState *cs = CPU(cpu); + uint32_t linestate_bit; + int irq_id; + + switch (irq) { + case ARM_CPU_IRQ: + irq_id = KVM_ARM_IRQ_CPU_IRQ; + linestate_bit = CPU_INTERRUPT_HARD; + break; + case ARM_CPU_FIQ: + irq_id = KVM_ARM_IRQ_CPU_FIQ; + linestate_bit = CPU_INTERRUPT_FIQ; + break; + default: + g_assert_not_reached(); + } + + if (level) { + env->irq_line_state |= linestate_bit; + } else { + env->irq_line_state &= ~linestate_bit; + } + kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); +} From patchwork Wed Apr 30 14:58:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886057 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp900445wrq; Wed, 30 Apr 2025 08:03:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUd0fbH1rXYJ+Pkor5chzJL0Jq5TiR4dLVjVSjjGAlRVNCTwyDy8voyj7rL/aT9HN2ApXq1lw==@linaro.org X-Google-Smtp-Source: AGHT+IHEph+GbmkBc6z6f2aPgRYnPqYBzuUfdrnCZIlUy4HHti1RHbG8L/iCJX+xKxhZaKcxfnua X-Received: by 2002:a05:6000:40dd:b0:39c:1258:2dca with SMTP id ffacd0b85a97d-3a08f7bdfe2mr3348618f8f.59.1746025402700; Wed, 30 Apr 2025 08:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025402; cv=none; d=google.com; s=arc-20240605; b=HlQcirXRzYyl20/3XeGWePxTA4Fo3LK3XSjxF2kt6r7rVr6Sp7heKVAM5gf9K+PScp M/efa6/neKGv9U7Lc0QAmcf7w+4Ssk2OoCLn+F2clqH4yT/C/jao7AlNf+ScZ6QWXu19 UU9DgoTzh67HSl++RptQZelQb5x1u3NJjLTcK0u00FJIukmxFG7laqkju0KxmOo693vS o5NTLT7rzhrBxs6WMlPWewy6wMGGyx5sdI3Dyu7SgqIg4ve29yr7IbSt+lZO0bDlFdby QrDNA30XxOF6wLU5xlLcFzCn1eWfs2t9vtI2/ofRJlhOyxgcK2QXfeB2LL3Qob8lu8nT wLtA== 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=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=cmreqgEk0AdlsvVInx55cvrGt4hBHogl+VIOlEyl5EQchHW/vdOjYMXR29B+04cI+m wauuy5LYZ/6CEcNHXyR52lTbihcCJf83QBvMhVs1DoSHO1Ad3EiBBWMqEmA/P5xMJKPR ndnpgMyhNuMWzuFAg3lfviAC5atYPcxF96+A3ExJAh9Kl86vWfIZ8pJ304khOhYxldON fm1Nov/7QSZFqQEfGpd4NHg5PQQ7b3WAe4MSHxS8WAOdZFcxOZiRUJcrj0ewe/miWpss 4V6vXZ/RiEikbtIIZFPXNioPSyOb3qLUBtCOway6cM6z5iWLfwLZPqJUO2dN4gd+ji4K NKdA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DY4qV67F; 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 ffacd0b85a97d-3a073e7849asi8487233f8f.874.2025.04.30.08.03.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:03:22 -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=DY4qV67F; 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 1uA8tx-0002K4-AZ; Wed, 30 Apr 2025 10:59: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 1uA8tn-0002Ck-R3 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:00 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tm-0002fh-5c for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:59 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-309d2e8c20cso8987a91.0 for ; Wed, 30 Apr 2025 07:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025137; x=1746629937; 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=DY4qV67FHGjBW3GCzb7xdWBFz7WsNIXbZG0lK5fwCNbIC8i1PoX1Cd9AXlwxHG4Ap8 ogkc4o/JdvxITol/Hzr5+RuJVXhBMiVF8hFYHtNNcasVpsTMsSmwoqbC8veLit2Drgxs OD8iWOBqTzRd5YJlgdwgwXy1eDY9coSjaOsx+QRTAEYyuKNwOGDkgNdlJqMzjbMkum8v igTvSaWWdweR66LlieVP2L3zHXuMDbVkZRHi+8ePAi+A5UOsU5SODmSfsiBWRZCuq+7t iEegzW4mzFDRD8N7ByQsXBjWAMAzysJ+HnvR3VZoFJy9Fsx2bkYPtRv/EijA0PYg3ze/ pZdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025137; x=1746629937; 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=S9UK2SujxvCeD1DpS7VVqYTAzso+ErjWyRhCSNYkcYz9uRgRDvW6mOlEiBba00a1LG WcwqV2YBnj/0UNBrk8RiLER4+nf52XkAwJwPJuZK96gQLvqUAY4OO8njUToSPGhXTyK8 KJ2fkWTUctpCEJUfzVoNy7Qt3tH5MeiI51xsxTPOcc136SUxUavg8vMjJctgb+7KNEMi l0CUDVGNtpBTd7vvAwp+01Ny2B15+CjxOFmkZHk/CArg0YIE8HSC6UPC/pDjffs1I8GF KOcu5mVtzPdWlWdmehKkdKWA/CqMAwshoDnZ4dGXrjs32APoEXIHivKSw5SkjT5qTm9K h9yA== X-Gm-Message-State: AOJu0YzDwY97cncX9s8iZlwPgee6e9h+Ta4MJSsZLJooV5yEQxLfaXBN YVNu5q1zxcPfjBSoQ7R5aD3G67hXtuHq8WZBMMGYDxzE00+8k9fUtHvNtCjsPjmG4vypqWcjJum U X-Gm-Gg: ASbGnct8kk1xR5PeyORApV5oh7WCV6fBC3npfirRqrg2wCNnMaNIrf1djxT+uMFx9dV OECpHs+CQOzijBTb+5cwcVHcB6FGegFKH/1GCFt1gGnerMa1GnM+9gjKjRhUGOjX3h5fuFkBMnd NBZgoO7WAc50bvfATWtElY+7MlaovNY6OLUZFMyF5izVRyb2KRzEfLCgjs/jeoXHG/LTySSFe3L aJREDsI77CpZcuDL5Cm3nyn4kAWuhy8+y04tCqyRAHfMp7SWomFcLa67hr9YAuR+ECeDEsmDr7B +Qtson4oBU0S/8uE9wU6+eVT20Dy2AacxwuaRyd3 X-Received: by 2002:a17:90b:1346:b0:301:1c11:aa74 with SMTP id 98e67ed59e1d1-30a333530c8mr5040805a91.28.1746025136746; Wed, 30 Apr 2025 07:58:56 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 07/12] accel/hvf: add hvf_enabled() for common code Date: Wed, 30 Apr 2025 07:58:32 -0700 Message-ID: <20250430145838.1790471-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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 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 Reviewed-by: Richard Henderson --- 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 Wed Apr 30 14:58:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886056 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp900009wrq; Wed, 30 Apr 2025 08:02:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVoJ800yTZyDPMS0iBv88Ot4aecrwuCCOP5TNKy/61y/g/Pg0qanl/Z0w2obHK5rfzzTW2gUA==@linaro.org X-Google-Smtp-Source: AGHT+IEktdgbMJV9mUSr83wGbZ3gKN5vST2VeLJ0M5/2jmuO15OKrKZhRP+QhzaAh+/6nYG4SV0K X-Received: by 2002:adf:ef8a:0:b0:3a0:90bf:b9b with SMTP id ffacd0b85a97d-3a090bf0ba1mr1690515f8f.8.1746025365812; Wed, 30 Apr 2025 08:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025365; cv=none; d=google.com; s=arc-20240605; b=M2GmkvNuuG/6gx3pBQs4eDS2zqQIvIgXqgVQf3b7TL+T+RP6w1cE+FvBGq0/9V9U+Z fIQmGpNwCntUJ4tuz1WLT2v04JX9/d6Ijt80FngdHyKseU/5FwEh8jPXZDJl8KHtmbSA +6OxgAhoK+Dw2fumIV5fHc7fat9b7d3fYj8PNsT9iOWQ/Gn63dfCCpG/EZRcxOIsxr5b v+sMu1MpRiTcrvWI0v+dO7w+lgZXGcTjrQCtCk+chX7yKuM5sPMkeC4hFsltZN8VYZ+W Ry8OhqLseizTCz6G5OfIWYwh5IDKZ8AQJrTl7WKnExYgMhc/MF+6W9WreFrIxWdVe2Gf TMBQ== 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=79feuVbSA3OZXSuVa7NrT3EuBCFmbt5HBuWm1ioEXwU=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=IFQ1Wl8deBx+C3OzAg5FqH/XdcfOmH7GkwUtylIuvO6RwwUufLElBhqQWV7fz31+wm IwauvmhpdMNiWkcfpgE8dUCoKAMm5IsLC7Uxxn2hi0w/WVdVyIVris3COMIerdp/e642 nCOOhlEI7SsmaTZsAG1Ry2B1aJR0ooNq/LMm/OqdvhuN7od5ErXaMvAD58xLiSReJNTf ZhBkE/6Ubsjksj33djXdDWfTfucPbjCmRerta+ffSuIQL//5yA/WwFfy3s89MpPJeb+j TCr9v+9O8ROn396bu5vbBef0JWjBrs4p9reNr6bxHhyGD+WS9EsVESwxrVKbWrAtV+Zo +ujg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SOomiNmi; 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 ffacd0b85a97d-3a073e72a0esi8517598f8f.834.2025.04.30.08.02.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:02:45 -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=SOomiNmi; 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 1uA8ts-0002Hl-H0; Wed, 30 Apr 2025 10:59: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 1uA8to-0002De-VA for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:01 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tn-0002gE-CG for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:00 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-30332dfc820so8799013a91.2 for ; Wed, 30 Apr 2025 07:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025138; x=1746629938; 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=79feuVbSA3OZXSuVa7NrT3EuBCFmbt5HBuWm1ioEXwU=; b=SOomiNmiSPtISi8Pm/NNCUl/OaHWwrlc3E8gcJNcx9wIWx8VZoPoj59SpFrdXSp9YW w1QipK+yWjlmw/r3ban1gWFdCgTxQhVTgPtuV7Ur4k6Gzu1+FftHwwuQFvRP9DFnvEcu 4mzoW+ix9a8975T7nSXmlIKM3mRFDZa9ytTVlwKSDUTaGx97XnhGt2Vzk2q11rRoqfNn VYX7NDhl6EazbRXb0CNxNq5cGgf9bypT6dkHs/f9vkG4DWA3A9HOtuVKYAsAENGXITd3 ntzd64+EeArvAWlYW57K8KKeZ4/dV+xqQyzqbrRCTZu67FePfXcT89EoXVExh7NlP35N DYCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025138; x=1746629938; 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=79feuVbSA3OZXSuVa7NrT3EuBCFmbt5HBuWm1ioEXwU=; b=MM0UA1cc4He/IFux5aOCiiSCGs6EgeOibA5yPDl2G8f0FOk8OdD7Hms++HHwsDgP7y x2HlC3DERn5UXqxLSw2IgcXcmqi6LJwimMIMtcSItsF45OX5Vml+h8z/i3lXNML7slMu ItckpQuycIh1rywyyVs6IvmvZx/zoq7Yi/djii8ZLRhRq/c/eYBjvqbdDi7o/bU12xhC a/eXt/K//hmJoee23cX0hCQKX1myFLyfSGJaW+fXh/iXybTHS6bmDrNn66Fi0acTL3l6 RBVLL8a0K1EuT3CWIfrbJCiFqNA3XsPPWuD0yBQySzVZaVNSnOqFKwhxzhFc00iYCqrG qunw== X-Gm-Message-State: AOJu0YzBjj3xHFXlhUZYczTeYdufrUs1mTrMLtFn4aZqj8jduXO86lZN cKzzl0Q8vhTP17S3OwkfH4/T7UVObi8wIFl7kyb/UGnKV8ix4SopkpUp+y56aGJPW79CGEpjIN1 d X-Gm-Gg: ASbGncswcR6hiFitHDboU7Q98s5XR/df+5nJG9GI6KGQ7yInnnR1+b9HaLaNO9issoX aSNxSScybNXhPQa/dbdlhIJ3s9dxjRJjH4HK4rhsr1e8XgFpm0Ytz0eqwpIj3WpOO2BbFeepUpt QspYOndvPd1GIZI1fSlV/jnAaQEgSzMNIPexCe2J+nW28smdhNE8ausnbVPR1iFIE2wX5XTdQQW 6/IbHO5wiSahaQNarvLFrI6Opujmpj25veH49IqWDqTAEqHfBA2QGqURa23IYFlqihNtF8AbtTU wQAIXhbTDf0ye11MZUINy8TN80C264ULXzHQGXxG X-Received: by 2002:a17:90b:3c0b:b0:2fe:ba82:ca5 with SMTP id 98e67ed59e1d1-30a332e99e7mr5932263a91.11.1746025137624; Wed, 30 Apr 2025 07:58:57 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:57 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 08/12] target/arm/cpu: remove TARGET_BIG_ENDIAN dependency Date: Wed, 30 Apr 2025 07:58:33 -0700 Message-ID: <20250430145838.1790471-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102a.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 Reviewed-by: Richard Henderson Reviewed-by: Anton Johansson --- target/arm/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 07f279fec8c..37b11e8866f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -23,6 +23,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "exec/page-vary.h" +#include "exec/tswap.h" #include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h" @@ -1172,7 +1173,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 = target_big_endian() ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG; } info->flags &= ~INSN_ARM_BE32; #ifndef CONFIG_USER_ONLY From patchwork Wed Apr 30 14:58:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886059 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp900689wrq; Wed, 30 Apr 2025 08:03:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVd37pk5UtpKdTSSUE0IfEtwzM3SgLBMX7Y9V1+OQWiJEdciS1i7Vgy8EpGKNhUBBs5oukkmA==@linaro.org X-Google-Smtp-Source: AGHT+IFc8PlmPA9+gnQDdX4O460iyQpY3p7FrD0gVfz7Dg0JcdsGwkKpvyGjHq2Xr/YLPNusZ/Zk X-Received: by 2002:a05:600c:3d05:b0:43c:efed:733e with SMTP id 5b1f17b1804b1-441b1f34f46mr32765505e9.14.1746025418640; Wed, 30 Apr 2025 08:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025418; cv=none; d=google.com; s=arc-20240605; b=ZrGYhfis6Tpuv+uFvQcwyPl5oeYX5dEWARSYYrh/4IP+Xl9ipvsFh9ew2Rf1Nm/LCV AvY3iNq/wT2PDk0vD8yV96Lkz16d272kNv0FKF6g2LKQY/t3IK+OwwM+3L2Q+rdN22UC kLUmaztJIRX4alEuO5/IMXmVTQr+259oNXuoGWyrtyxvOKAhVzW1t8l773D166wYj2ol GHA+lTVHsDyeS6xjgs/aHqdGcrw5DCj0rwIm5iG14j/Krhzt4lFHAi54WsySZWyztpv7 xZ+ebdazQH4ggLszZ+lDObWtJxvWdakXg9vIRhyPq86qk/WjgZUfBJ6ZPyRxN+QTiJ8L ocOA== 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=QBK8LHWqvAyuwDxFuuTqDb/KWyXEAnnOTejYROwMLow=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=h9ff6CjJ+baJS3RIDtZ2hdPaY/YO+Za2eUurvadb1cZuHIIZ6Tr8kZR0lwqJpBwX87 1yDbs8TDDHCQ6AI3/YCSH3ikB2XQsHkJLpTRWueag58P6tNKf//lnTUAOCpO1dUjSJiK RCYUj8CPUA3f1Q00JFkL5QcHqwHLaRQMwGSw78O/QqEg7sKeV92qBWb/X6laDwoAjZZr 3E5Un7PfT3otLyRtfvlW1rAKtLKMC8X+JnXl+JF0BidzZM3YkHoBPOsc9fA22RSIiQz3 ImCkA7Jm97SMkRZMXbt0KX0NEq5kWIHV9i4dIZOP5Bs2ShDsoHoQBXjy3lQwu5bQ9KXY lE+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pw5ug2X6; 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 5b1f17b1804b1-441b3622458si11619465e9.134.2025.04.30.08.03.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:03:38 -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=Pw5ug2X6; 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 1uA8tv-0002JW-59; Wed, 30 Apr 2025 10:59: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 1uA8tp-0002E8-Io for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:01 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tn-0002gU-PP for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:01 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-309fac646adso1037590a91.1 for ; Wed, 30 Apr 2025 07:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025138; x=1746629938; 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=QBK8LHWqvAyuwDxFuuTqDb/KWyXEAnnOTejYROwMLow=; b=Pw5ug2X6nNhm3mmhdW+ki6XsGgSD2U8T6TqbCs92mr7f/4CW7w0pgemeACWXQmpM6m ofUpXQ0QV1KShxkQ/DVsCTrYqKCWFXUwgCrIZGG1ZoFEZFu6LfDaZjh9jGSg1cuoThCI W2SZJiXnzDfySq5F4hNgPmfLgqEtIRdBtocIhyqH4U+JLPYvHD/VqqA6JUlYFCMulyOm Ososn55irHKI6a7eboojkRQeSsOUErlt8UdbTjpkYfh8W0GqwGOpPk0Lgjzic7RXvv4P +j8LQJ5QQE6y7+0WhqRvwDIyqnATgDbBbBRGnvO3aHM+3ac6F1iM0vn3kKjKgUilpdkq k9dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025138; x=1746629938; 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=QBK8LHWqvAyuwDxFuuTqDb/KWyXEAnnOTejYROwMLow=; b=Q+LiJKb3Nj0aifsZv1CBU41Ayx7+PYc4mULzHDE8Jp9jq4Ffx9t/d4tqP0gl2gV7dC ahzCDT7FD3ub7qfLreLZvipjI8jtfD91qKlmp+V2iU4Ty0TbpzYd4W64Mff4czjgKsId oUY3XZeoUEkO+4Go+N1ASYNvhzSLywv+okH6d6OuupOB++X9jyEIq3p8b2BhuShpdoQr aWGUGjBS3xuL33A0ogWIyIX2wtBfVubQQGNWNhih58xukO+Z8ojpjF2wcW2cupraaJBc i7nNrTFs+PXT47pV/o+lEF7CrVeeLGe5O2r40zW4o2HbCiRD7hY4jxxKMw+yqykdEdQ7 s2qQ== X-Gm-Message-State: AOJu0YwXBBzU6wfL1I6aFsv1jM9rgzLDnq/regzwfqEN3qqJAHSsp0km 6Bfd3APshDNBNEOxrmqI4DSWSYesg7p0nCswmtmdq4u2/yzbyV2pIZEeChD1OBJ6aXNBeKjqcas g X-Gm-Gg: ASbGnctW6rg6FsX7WUXyU+x51tRCyYsuKauoYXdbjfQ9bSw7K8hDm7lBvI40PSeg5LF 1qNOT6maYHe8L+IVxVuNlIVleuz8+mvZW+AH6CLel82nKAFrf8Eohii4LoEsNInw9BaS5pKKoFA Tw4KyY6WluMCYZR64CCcumSry9FjizmupcpG+ATedqsmwmzbC6zdrJB9NrsejTw8NhJ1S1Kablx zulTD9aFyoCZ1HLI2qzzdON6J40BibsG2KgbWoLdYSb7oIcrGNrlnHVVUPB9kYC9gyyXHWdT4Lb Goa5zWvsx3iPWtqtkVAMRYOfVAuoqnN2gDuqvLiU X-Received: by 2002:a17:90b:5647:b0:2fa:3174:e344 with SMTP id 98e67ed59e1d1-30a33d3b0fbmr5073649a91.14.1746025138468; Wed, 30 Apr 2025 07:58:58 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 09/12] target/arm/cpu: remove TARGET_AARCH64 around aarch64_cpu_dump_state common Date: Wed, 30 Apr 2025 07:58:34 -0700 Message-ID: <20250430145838.1790471-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1032.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 Reviewed-by: Richard Henderson --- target/arm/cpu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 37b11e8866f..00ae2778058 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1183,8 +1183,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); @@ -1342,15 +1340,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 Wed Apr 30 14:58:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886050 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp898735wrq; Wed, 30 Apr 2025 08:01:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOl0CSNLbCZYhq2QRvjY7+rPm+wiu7oEg3C8s3VJk3xRekX7Ks5OURIZa1c4qcx8tgC/RPAA==@linaro.org X-Google-Smtp-Source: AGHT+IFuop8ycwUUuKMIgW3dXXqFzWnYV2Ss7rpammrgVU1PO5SDQDG1wHXJAuS6ePCRQdqwga9v X-Received: by 2002:a05:6102:808c:b0:4bb:b809:36c6 with SMTP id ada2fe7eead31-4dad493fb87mr1969586137.11.1746025275107; Wed, 30 Apr 2025 08:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025275; cv=none; d=google.com; s=arc-20240605; b=fHyFah2rrQXQs+iDGJm9xk8TeiZsVz1pcgwS92q/CRKUHC9mIZCb5wEPb4EXdneFYD c9waUcLNamhwIzaT01ZE5wNzDj90y6+4GHa+4R2BI1VBK/aiaX6GQp6koYUmsX/M7F7I 2vY62RaG7nBGetAmKE3DTqWzM99fC22eL0pIO+JCH9XJYzhMWXtMLm3BdPD6D9X2wuuv 9Y4AON/ElTfaEW24rS8uRfjt2/R2TaFg6fDDcJ0/E+GCflaAIYRUlfUF165KhO2C5b/a bZD0wYpxBbjFifEC3Re867VNBBA5b9HCpU4cHgcL/aiMQE5gQ90NBMVFil8KeVNVE1XF 0JOw== 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=ijNdOguPfwk3cK3WhRDHWMHgdilsTL/0Rfwd87XXhiw=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=kx+mEOv10uPjAPORW26UkoT1DimYWsZSIunY8ltn72ztXkxlyNyrAAcrKaPtvI7rlG 2KJPqx5aCzWqKh/oftHUB+RP6kXZDSctaWHTVHKNdb+Ci5HwNc5lIfiAhVz2VUQqXHvp wo1izxkOzijyAG52+zwTGYUVjSFnsCYT8exhkP2vv6XytXCDbGKAAjkihmeryJ6tsPbr WrIZQHETZt9XD5aebA6S/5RhRTAF5JW50BaFb3sUGwZqUGybaIq0w/dB+N6QFqeKLFkF Ky+bzEVlvIUwomXDJLN7KfNYjSIUXgrWtAS8FUR58qjqlYdB7n83UH61EHhGHe8S2DwC n1nA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gcjyNlKq; 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 ada2fe7eead31-4dad4243f39si447911137.338.2025.04.30.08.01.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01:14 -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=gcjyNlKq; 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 1uA8tz-0002La-4w; Wed, 30 Apr 2025 10:59:11 -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 1uA8tr-0002Gw-A9 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:04 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tp-0002gz-AS for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:02 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-30828fc17adso7400142a91.1 for ; Wed, 30 Apr 2025 07:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025139; x=1746629939; 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=ijNdOguPfwk3cK3WhRDHWMHgdilsTL/0Rfwd87XXhiw=; b=gcjyNlKq8ZrQjbI8LK9Bz5nlAxOnOB5OV2/IN35CoQI1O9UNoQilvtB9TmBn/kjK3A qRll8WjlMI1x4ZjIsQ6l6bCbP3JKmVMee8h3mZsdvf9sN4I2xWRf21A+XU500BLMCHBQ vewiEEAw0vBx9dMyWVr+eXXWtIbqDc27Z7puEnMFs23+gH1IzNQ7IF1idKN79dWJFKlW aQWSKxYmkgmBNTv5I0kw2UI0JDuPxSUlf8ir3evCB80fBf1isMKfEwfxuC8SsWh2GHBm Mfg4wY7+X+0UnMaSPTUb/8m0KKre3hhViBGcEnm9Hj/8KpDO5LOnBwK8B2bMQO4IanRo 0BWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025139; x=1746629939; 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=ijNdOguPfwk3cK3WhRDHWMHgdilsTL/0Rfwd87XXhiw=; b=fjR1wJMDMBFQkqbCZww/JX+2XL4E9EZ4HqRo0hyoN1SlYiMu5jOCBbFrn5uuPbJuVP d6XttcH1YnFJ5UDqesinlbcM2OXtx2irOFJUHieu6KBe8GfweojEln7hbGkClHYUrOMv Iz0P6Hc+0zaLkyqeknxqaGBM5uu0+68cGs88rNsRm2eiEp08OfqflJcCzBmRVs6HTjax /pzv/+v1qQKzzSmz2/Fj1CH3lQRtM/dAPvvu4Zog3cw7a6lX+9lZPCo1W5n4FIzS8Tpq lzyZh0Znl0tNX/OO/nnMHEW+/kfWPB2UTQLnJ6zR6RWp9whsmIwgsKQrCLyLdhb82AUc Va4A== X-Gm-Message-State: AOJu0YxzlyR2kPvlVgYkm+EuViUHp2y1Rjbj+h2ezd2WdkwralGegcdA PVhJhjjlwpdo3B9GKA24E4b5EFysuoQDIpkfW/Fo3gKIo7QlQb0oYCdZ6NHRZDt05CqRsXOfIMv v X-Gm-Gg: ASbGncslqBdAasj570TVbruWC7gjoUSc0X1gQnz7WijTi5SJgRIlEvjLcieWU591YM8 cf9mJYtJ0KReI6pRW1DuHVd508YYGbwv6HyJEDPoiIEC0Uop3L9HsMgtuFKGxiSikY6wxq7VKg9 fO3lcIUQ/su1ZYgQtP8j9SqN0g48faAPuP+fDZKic2iKgMb8pXIAZ+ME7Lb1ZHcfQor2puVnszJ 4NRYFWUATEqvOGCiQ6sUnMPvoxyHJfm1ZARCaig4A8I0311FeYwgbGfp1pzW1XAYyIqzDT9klZr wnEJN9F8qa+D2Lfh2Q5HHJrQSbrmwZ8oQDvwTXke X-Received: by 2002:a17:90b:4f47:b0:30a:255c:9d10 with SMTP id 98e67ed59e1d1-30a343e8b08mr4234791a91.8.1746025139383; Wed, 30 Apr 2025 07:58:59 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 10/12] target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features Date: Wed, 30 Apr 2025 07:58:35 -0700 Message-ID: <20250430145838.1790471-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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 Reviewed-by: Richard Henderson --- 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 00ae2778058..c3a1e8e284d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1878,7 +1878,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) { @@ -1914,7 +1913,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 Wed Apr 30 14:58:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886049 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp897719wrq; Wed, 30 Apr 2025 07:59:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWiy74AV504Csdl5zuLwThkfa2y7vNQAjbHhu5DqdodO+6lvU1go+1EtkEhtMRlVk2Z/ATLA==@linaro.org X-Google-Smtp-Source: AGHT+IE3x6qt4W/G+vrQCkoPS41eXJQO/cyiuEkOOuL4oz9HakmQLBzLYtDVl3Oi+A/pugk9d8f2 X-Received: by 2002:a05:620a:4089:b0:7c7:a604:d432 with SMTP id af79cd13be357-7cac7622263mr432868385a.30.1746025188333; Wed, 30 Apr 2025 07:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025188; cv=none; d=google.com; s=arc-20240605; b=OnHkTXSWcPt1/rRLHyY8/szcO8JRwUjKkyEfW3/JvDZboJX7lsiyziQTXQ+tMPjAHF 9WpTyLQL66FsyUfrnMOWGSpiLpGJiq/AJyC8A3cnfWUsgn4VfshX6bn7nPPAuvDQh6Qt klI0glb85OfLawpAKhHLmShtjiQVatD6IHWhWZLWoWCQYFFZ5Ng4rLz89DBE85h9WiCD zFmAbRfGkiYtYHbXDVjl52xp+C69uIAtbFM4l9KzV6e+TAW+/sHwd03OpabAMAxFBud5 SzZZCJHpRvhyLAMeEekNfxCYVbf2ankIkMmutwYquS4ioFq0zm3GjJ8bFhX6YPZe3/sg 4Yqw== 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=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=lOHJgyFrQXedcJygCr2AcYa/EMyqULYCAgc9zMuto33peKEmgX1bPAap4vFSweBKvk c2Eu7JBNdJ0FmGm068Z46p3smTZ/8XdeVjHjcrX47L1CScX2vq5rHxMzasZUIswxqoon 9r0sHbUaWtUFa/3f9+VQiGxPIdmE4kaNVTuvAHa7OOJRc7joI4vW3D2T1DGC31Ua7rt4 sR93vmtbKSZZBBInVBliR+5KtmiOH4NPBxJoyiL/DAvqvE6jjocU8N3tYBgi9kncYu6z jCFKOIPxuiMSc1TwI7/R3WgaGZtdTGeI8uKBp90SVUdgyOsCzsa88R63f0TsCpUQudOZ Hmig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="A/dzlhys"; 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-7c958ebf294si1475168385a.577.2025.04.30.07.59.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:59:48 -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="A/dzlhys"; 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 1uA8u1-0002N3-4R; Wed, 30 Apr 2025 10:59: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 1uA8ts-0002Hr-Gg for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:04 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tp-0002hG-Kt for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:04 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-301918a4e3bso8052194a91.3 for ; Wed, 30 Apr 2025 07:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025140; x=1746629940; 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=A/dzlhys+itIts4Ds3wlgHsHfdEicCCa9TU6OK+gxtEJXU7npZq57+gyNjO95cnsNu JwTUgcJYkz/uOAFiJRKqyU2ylhJnYhmttgtWF4B8Zx73eIVLS5hXagxEQum5QY52CByR /ntT0CJV8GsK3xEd1XNwhtC9Ax6EqSrQkq6TS/VRQH9V498YwlxlGjdlcy3GHEBU5TmK bX6WQ37mX/zkst+mxRmxGF65L6l5MCLF2mQyVgrMuc4N/UMMmvf3iYVxNZLYs1yzKqen 2bnZIU5pq4FDdDwT2VpICs1u4yGir4uyIjVygL7O/1awDBJetccVYi22J5r4gcfjA7lF Y/Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025140; x=1746629940; 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=jBTxtPOV0tz5KF7Jl5FMRCh6A5U2mePt7W/Swb7EJvglvhlLs4M3/vo6IPSjyv9dTu k2IFv+kralgIOqJ1RV7m5D5E3K6s9XRy5+WamUyfGE9+07hRJbwCD+4fgreWdTynIlCV HtJdPIiI6e7nWcCgaA2cFbR07GaLqueMlSViHsMaSkVzPEJgk5czr6IfqbV4ykNJZnU8 YnB1BAXdXSEC3Mnq14inPpabyHIOfjMkH0tsd12AaXxKlMXBZtRYhc455eEhjdz5X6BW PGT3osLmqqvUSuzBTG5DdDkTVv0Yv8pBNjgEbXIXkTk4H1AiP2ubkkD4KPmr1hHGJVBL 8meA== X-Gm-Message-State: AOJu0YyiF+CqoyZzXzERYwMMl08xl6yoLF5MAYxdDcN52jwMFrxL1WYw kJhNP2rEmbDvNzMjo0Pn1QaSkYFTx24uZLq84g5GvCMHeTprx1WNEzEMFE98Of6o9ITZk3litKO O X-Gm-Gg: ASbGncuEvhHHKyO7tFnO5vEFn9JUoxQ3Kz+zekeuQ0ufeSJWac4UwCc+GjUTV0/gh/Q qyR37t59rmRlRm2GN9JVVJ3SDL9jkRzEZ/BP43YSd5GhTXchNLzCKXjvSz1hHyrqTdxyfKh4QY5 jpjuZi2aRDzKJ4buKyFGJQt8sHV4yeFTcPxDsYb9WJRch1vlmaZqnpIbdO1QIPpxoS+aFTVIZpd n3Exve+khmuJqD50kAFiSFDQfSpbi3OlMPqA345JUmodeVuT9/DSQ9ndmFTn7rf1uKCDNupFXZk y9p4hwQkq5bsljb4yfVoxrlakQyi0bxAyvKjFijM X-Received: by 2002:a17:90b:2644:b0:2ff:52b8:2767 with SMTP id 98e67ed59e1d1-30a33300e3bmr4611242a91.19.1746025140211; Wed, 30 Apr 2025 07:59:00 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 11/12] target/arm/cpu: compile file twice (user, system) only Date: Wed, 30 Apr 2025 07:58:36 -0700 Message-ID: <20250430145838.1790471-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1034.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/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 Wed Apr 30 14:58:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886051 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp898768wrq; Wed, 30 Apr 2025 08:01:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDzPZWtqJwJnT9Q+FSZB+A+81WxzG1tgon/F3Ap8X983oUBM6UOk7wYZTCvUjWm4+ATRPgVw==@linaro.org X-Google-Smtp-Source: AGHT+IGqy07bS7Q7LNkxklsgi/Tv8nCOLEMiaw3j+I/pxY7Lf+G0UK8VUNPty001/EVUAGyV5RjY X-Received: by 2002:a05:6102:441b:b0:4bb:eb4a:f9f0 with SMTP id ada2fe7eead31-4dad39ca478mr2813250137.24.1746025266463; Wed, 30 Apr 2025 08:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025266; cv=none; d=google.com; s=arc-20240605; b=UJ4pqufORJRtTrL2cjgEcNkJNix1U1cHq62ygm6GOlIfRFq7uSdhi+XSnHe6QbWLqm 1+YzY4GzSGG+icZR4RmzYVsQHCSkKPqqCKKZVgeV/sYxsQU2IdovdanlUYTwp8MmlXIE mODoZjLGEzLwvv6w5aksdWXE6kQluj8lzvZdWi7tmwT3acpLhMAZy+o5x0v3R7s3dHoV JL3uKLYA2MNPyJFuPG+j+vMlZnTq9SGBJ+a246Wq7XZhlcGAnQuzyrkjGnCUX4cCMpyk mjmDq39ez36M8H1s+2wwae7p5AxQV/R5P2o3zstumqquLv5DSLS7dI823ApDPkrPpru4 6Pog== 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=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=CDJTaeWM/stooflNPfEZyPtaXPdNs11delJPM9ENxMgunylYmbIICnDQ76YxZGLpVA oJi3opWYgsSGvtO+nWdC0bCnJsEmuHSilwfb0UGzUwOTtQvydH48Irem4zHWlH8wDYAr gRJcPi/LBn4EywGjX+LHJE1hVsS6HZfkj2yALzdKTAK+XWTVp2pOtkFkumE2gNi5aWhy OLKaLI//xCqdNbOGIg/EFavvN1nv2RnH9i5IoUtpfa6M0nCsVvUdSfZISq8k0QFI8PEn dx8ZhetC8C3NPd5ZFkJS6FqqPrjRhHl/7bFjyxJiLJQ6RaffKWqAxu0L86aTvsllsS4e TwsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NpSPKJEA; 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 ada2fe7eead31-4dad4296038si499648137.567.2025.04.30.08.01.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01: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=NpSPKJEA; 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 1uA8u7-0002Sm-Ht; Wed, 30 Apr 2025 10:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA8tt-0002J9-Of for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:06 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tq-0002hf-Ik for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:59:05 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2ff6e91cff5so6829704a91.2 for ; Wed, 30 Apr 2025 07:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025141; x=1746629941; 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=NpSPKJEAurCkEaDsEhSUWJe1Y7GDuZyAOIQW/oz7Bbgn2J5+eqGhblrPM8XoCD4HHq J3fldJVEhTOpMMGfocZKBDvvLwe6DjqgBGRyEMy1ILS+I0v7ksPuev+VzFVbQOk1G6Gg XwaWS0bkL8SXRaHh8jU9yLBVBrexsA+Uxg4jLUt9RksuqTgUs2YxgiwSl13h8Ah8F6b4 lRBDOc1LvcydsgFXdv2F2B7np8bop2mFNQJruhb3iz2rspESno/WLy2XJItVJjt9L6DA QoeGGx0XeHF4JkON83FGe8UYqSrkgrUcDxZLXlPjvSKPPjwykcRq4xjQb2h/HEHgNkIT JMkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025141; x=1746629941; 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=PO8PZbnrxLhyiFChKGYhPQyd44F/G21XC1vkiziEuOCombugxKNUS4TdcHMg2L10Kt 6DBRqmeUdcgbSDmkThn+uG6XLhzGMrmN9hNcYykDcZL9nYO+2JDYpViFihjdRU4TuoCF ct7B8UviBLsUqLUaLxY+FaeBidKcFSw2T1hzrEX+OuS+JSymXiPsCgBtoxMlNYaAWo19 aRjvELH41oQMrVbWBr3kG3GXuJyAYEPfDQZhDlt+kP4nitCBo2W7/8JcqkGxo7mGbHt7 KZOYB736J+IOHyUaNCNp+rxYAo1fieE8uhnYH/Hog6wtPFupZW2LWKSWQV03bZsMtf7u AH7Q== X-Gm-Message-State: AOJu0YyHmSTK5QiH4blsihOmoBkkG04f0LifEBsJzhEophseO+MDjcfS CBdx9HgXzOrXpIjjsxxo/sCSBytE9a1cZNXt0g//Ag1tndpVPS65W+QTI3t2quEMxc3+LyBuQag 1 X-Gm-Gg: ASbGncvnLQb+/D/KAHo9iEkgxaiqtLCk2/bPnCRZdLUPKeef/PZLYTzk1EnWT+Vl6uU kKTLNJfOv1b4gdM1dGedJ03DAn8Y3ScKuMAj5wuNcB6N5YHkmclTNxuxqTko3aQQ8ZGVYqgdTmn fqOWWb5j1/2vU1WIWNU+x2iG/6IrnCQaMB7PRFyjC8/f4xH3Kvb68KAwEbm+a7LPqBg5SJAY29R D298IaatUwE8/1xuWO8BG9Xl+ULW/WxTyLcG7wUM8bN0U/cXmQwUMjids1NPUt0kKEfZBVgJqml KxiaSUgYvjLWnKRJuXi64Q9JRg8XQg7X39zmZdTA X-Received: by 2002:a17:90a:c2cd:b0:2f1:2fa5:1924 with SMTP id 98e67ed59e1d1-30a33351198mr4339010a91.26.1746025141034; Wed, 30 Apr 2025 07:59:01 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:59:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 12/12] target/arm/cpu32-stubs.c: compile file twice (user, system) Date: Wed, 30 Apr 2025 07:58:37 -0700 Message-ID: <20250430145838.1790471-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102a.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 Reviewed-by: Richard Henderson --- 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')