From patchwork Wed May 7 23:41:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 888139 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp632845wrq; Wed, 7 May 2025 16:45:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxUEwLAAl01w5SKfni3Zhi+QTGtBcmN+FcYFaS8mm2xKy2qDZk7QXPLq6tuc+EAdzYnBAGOg==@linaro.org X-Google-Smtp-Source: AGHT+IG8eXFpNxmkiQqINe2OZ8ZUb5sA19Qsgug5BL31J60jCB9c015mfDWGrBRrvNRZArv03SyZ X-Received: by 2002:a05:6214:5089:b0:6e2:43d1:5fd0 with SMTP id 6a1803df08f44-6f54c48572emr20031816d6.31.1746661551240; Wed, 07 May 2025 16:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746661551; cv=none; d=google.com; s=arc-20240605; b=ccuHP64KkJ4hZLICsruYnnFB8x1NhPlUDXutQlpfOAkG7FACzFlIlTQM43x0AAHM5+ JV25A+NHdXHmPfW+Vv4zQ9trCdBqVxfAMAab5Y8S/xBYAHLUVMXSmKTwigWa2A9njnsu cNIloDiMWibn/td3sVfRTyUwUr8t1oGuA2bEMjZaAP2xxQAf/d4Bo1VgfFR31pIeN6XU /cMqPkf/yH++S1hPXn6n6bX5fIY6qfLHlCTMPQym3uh/hiIv3R61/y+G7dWDYJYUEB1h Z8Rtig7INLIgj2eSiiKmsgY+m3NLaXdJyXwKXEp3/G5ZoL75X452635VUSwT91q8A9yK l+uQ== 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=Gch+3DQ1xFSIgoe8nsFHA95PeotLzKWriKqshNx+4Kc=; fh=Zbxy5TRiDd+Eff0zsN+2XmZYe/TihsWpxb97dHV4h78=; b=M3TRsmCISzR4EdrmRRk5p9lvav1dg5MYtSLQOPYZXj4q4JR+a6vm0uGCete8lg0WyK xvsvz42ClSXdK340L26ZSiSA+ST+31G7G+Ce9U0/c9B11FIIMXLC9+lIl9tMnD3FT5te ebgoFujMoqrvNndUTXN2mP4dBUi8c0XeASnYzBRnalfW20UQc9Cf06DbOiZBqyY33D2y CWGeq3vZg9LWVnyq9fgtahv+wfg5DKLJyU86rHnUHwz3ptIx6Hj4BaqwvoQWinWLJ4RS rQnKivho5+l7zT3TVm1mV1Ct/MyG1S8fohN2GtLitDSmpRnLKZKluIOuPH6UIib1xBsy UwIQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CBsJ3j+2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f5427f5ce9si31718856d6.397.2025.05.07.16.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 16:45: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=CBsJ3j+2; 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 1uCoPh-0008Hm-MQ; Wed, 07 May 2025 19:42:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCoPd-00088W-8R for qemu-devel@nongnu.org; Wed, 07 May 2025 19:42:55 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCoPa-0002Rn-RA for qemu-devel@nongnu.org; Wed, 07 May 2025 19:42:52 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22e4d235811so6440145ad.2 for ; Wed, 07 May 2025 16:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746661369; x=1747266169; 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=Gch+3DQ1xFSIgoe8nsFHA95PeotLzKWriKqshNx+4Kc=; b=CBsJ3j+2QyuNivehi+xB9P43lk8g5PotT8KJAxCgXTh8AguqIx5InrLLJxgzLr+Pa3 5Hk/4Uq87RZ1DQHhRmrg81ByYnKEam/uQawAdbGBfUxFT+dsdJfEQUpsWj9HvuRayzEr 9ZsPHjcDHTTgLuJwJo6MnwWM4Nhm0dYs3qw2N/s6Pe37kRW6IZZAuFtRO4nvsIRhrffQ WNAeGMQtMVGI14hRY9WQECw1OIPABOuSATsWZomUueDYyZdee119V8nPYaKnnNA95p+P AX/po2M7UOFH5PD277F9WxO5NKlh+1TDd9ygdG3jCNvZU6QQqRSjIf1lA/CqCKkn2Iln Pltg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746661369; x=1747266169; 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=Gch+3DQ1xFSIgoe8nsFHA95PeotLzKWriKqshNx+4Kc=; b=oJAN6QGSu8zztvdmSXPytkfvmozAR1LxsoVJiFNWV6jRM7IfjKVZHtEqG/0mWoc4qN kr+OUUOU192uc6nDVgF3Flw8YrI07WB2uodsW3VQVEplZsIwzI05F/AsYW50/LxhQE1v 1sRYpZkvTiL/5YAs0BSx2oJPv5XZ8QtABdpSvyNMTYMAEETyQ2VpRzJ1Yiw34JXZEFi8 B9zWjs3RZqsQuYrMsIeVfN0tXvys76e7T+DfYiXIfIRTsgKF/6s2eQPwmtNi9UzLFBTC /iY4MwzBkOzec8rwLlTyVMClbe4pFb1sN+4LkdL/26nWChrae4GtRLLmdjpZ2vG3bTXR tqzw== X-Gm-Message-State: AOJu0Ywu2OFox2uAj5llP6Lbt/xubHNDePjojkBSZmccV6kfQDSRnmjL W6aIHIvWOp2+M6eLx7F9th9WaiZqj0CkRKOenSa+DxJ3SXZYdkE7Ez8gq41GpgU/d+2Dw8Nki+J sKzY5rQ== X-Gm-Gg: ASbGnctVt94hvcJp/7ssxHaBEYyxEBg4kfz/T3snpPgaQZy9G490JUZGufVFwT1mfBi 09p/q2w+5zs0WPcWhRkihDRKXPBoBUJ7Nw29J+jEkBFTd5wZWc1rf7HFxhTAvkN/AHVGMvLPBYl +s8IsS/nc+kr8YTNrnEPLAyPmgAFAh8CmyI89T26Gnsyp3tvybRxLR7nkUYNR+uMicvvowd9PIi Z1F3gbRLtvXIiEp37lDltZxippDT80Nv171ONApQETM62NCC3Y94nBD5XlGXfNntS9pdnEdHQ76 atOHa2yrRbUmCWW2/KmcCoY36njESlBcEphDNm2M X-Received: by 2002:a17:903:fab:b0:227:e709:f71 with SMTP id d9443c01a7336-22e8660497fmr17618375ad.29.1746661369557; Wed, 07 May 2025 16:42:49 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e815806fdsm6491325ad.17.2025.05.07.16.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 16:42:49 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, anjo@rev.ng, Peter Maydell , Richard Henderson , alex.bennee@linaro.org, Paolo Bonzini , kvm@vger.kernel.org, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 07/49] accel/hvf: add hvf_enabled() for common code Date: Wed, 7 May 2025 16:41:58 -0700 Message-ID: <20250507234241.957746-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250507234241.957746-1-pierrick.bouvier@linaro.org> References: <20250507234241.957746-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/hvf.h | 14 +++++++++----- accel/hvf/hvf-stub.c | 5 +++++ accel/hvf/meson.build | 1 + 3 files changed, 15 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..7f8eaa59099 --- /dev/null +++ b/accel/hvf/hvf-stub.c @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#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'))