From patchwork Mon May 5 01:51:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887419 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1824760wrq; Sun, 4 May 2025 18:56:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKvHwyMAVOb0BYiETtsGCsBqxOFN1Zn/0x8myKItLjzEGdTi1m/9WD3nl9yA+jcEmguyctmg==@linaro.org X-Google-Smtp-Source: AGHT+IHW0iwlacdfYUc+CeLh8Gqty4qL4AYGohHU0qZP8A6GW63xf8N+TkifzXrnLmijywe6wmKj X-Received: by 2002:a05:6214:765:b0:6f2:b0a7:397e with SMTP id 6a1803df08f44-6f528d19badmr94224386d6.43.1746410182421; Sun, 04 May 2025 18:56:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410182; cv=none; d=google.com; s=arc-20240605; b=Zn7wfdy5/8lOfbXJGNiw3S+h3ooQJI7Axse1kDO0X//oB4mtQWz7qxnzA5wqpJqpA7 orEp1N7DaiuJyUMSWHYf8VXod7JAfN0jLOftppWAckPYTaJHuCZm2Z3eOKhviF1PtOep 2BvRBxg1W3OuwM4P/fyAwGh7oqK9AEO990yQ8En97IiXB9zyCmPAbBQj1A4V2zb8lg/N pqsRdZ15Jr+nwtNXKo50DHK0bZ6Z6ITbVuu0sHZllF/nJFHcU1WSfWbPI8V4xkWDwHsB X4ySeub2fYLKDQywtTaGTwvkDLz8duL7Dxn/qkNhaWXXMqbvnf6TJKI8rRcYEPyfbuRi YeNA== 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=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=YGESO0texeKXT1YAl64UObF2lIvR+fsGOgRGG9867H8vXdrNjrjvDrVSEDBZWsZ0sK rC1lAiJFElrmGpr+yD/NDce5h16AV4eonDA7ZH+qJkL2Xly5GMRhlz7nvCKuKflbNydW U7whn2m1iu6df72miG4x1IY1JWFp8PCcIXnwITisG8mK3BmY72x2kGJNd9+zk2tF0z3U EqkHvIvsJOAT2nwvHush9m23dEU+/dDqjbKwQoWUpbBexiae5B6R2KjSk8FyTnEV/c4k yuTcWVtcXMuFTYB/7jF5aY5aNZnz0pnfJSDJpyctifSpzgi8QslDwbHIaVkBhrmA8lM9 bhZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UePiZeZT; 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-6f50f47750asi80104976d6.207.2025.05.04.18.56.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 18:56: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=UePiZeZT; 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 1uBl16-0004F8-Qh; Sun, 04 May 2025 21:53:12 -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 1uBl0g-0003uc-Uy for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:49 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBl0X-0002Uo-00 for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:46 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b0b2ce7cc81so3533625a12.3 for ; Sun, 04 May 2025 18:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746409955; x=1747014755; 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=UePiZeZT5e+XiUGFiF3Q+ILF9kUJWLlPPKoWpBf4tun86enpbq5FWs/6CrXjuPGWPm P+9XB9rK8yzLWqdM727P6Dnj5stLIf/f10L5Sgmi3II5pfZeYiBotRfRtGA8UNn2WuW8 AIaEogVpSTd8PAv3OhMOfiijbQrwDV+5Gw/8IogKIxx0PFnyrtVqijMqvkIFkehIxmzq RaMGU3nihNj8tg+Ls4bnyYg0aYsct+AjcgrRIQFVatZ7UTPZh5YarCAM3DZ7Td5bmfvo +xBsHsRSUpZyFeoMkwkzIkeNPSOGudR3pQa+w32PnD2o2uwPIQxBsDLhcMDa5cFo83tr j3yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746409955; x=1747014755; 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=kx+Jc1XhUwVpMMvIVLxrs0XPLSmuoATx8V51VhgtwbZj/SP6SyISmxd0YAQw1uLNTb KH63BXJZilpqKDT0wavBgpz13kwacc+nbT9cS8VQnZjSnhxDDFeWtXyiIFBd5Crp6cbi BplwXviDgJSBHFswj833FNNFGyaGePYl7WKOr1UbpO8JF9FUx57L69wM3BDjQMIT6Odi nF8N5DHWKjSg1R5MtKckL1IpoS3knc8nJ15VreEgn4M9zw/cDnivRBuYRpHCQJjFwlLF 3NcKwZI3aYExHY3/HH06b03BJf79LduhZGd4ywv5oF4C35gE72fQqHL6us6dZEMbg/9x nk+g== X-Gm-Message-State: AOJu0Ywkar3rPNYn0g6n+xVS35OCFD2PvRDa/mjc/dJttJFdG2S+QP6P 2CTl5tcjedE8lDG0eKpbdMJJu8EPT+wzLNahLpz9+GgwIA6qYTgzrZfHRBMnaOaggo5XuRYzuTB lvYo= X-Gm-Gg: ASbGncsnfyU71cLKfn1OMOj7KdDmJ83HZnyZcBfIf69oWlKInI90XCrznv83ygG2Auj 0CShp0SV2CMwp9UkT3F3JjPtatVNOmkxLiprm5iu2pkm83/lXmd8zlVpi+Y62Y82vZNpFQ/B2l6 Eu/l8t3I05WcWM6M9mi9pa/c29M3b+FBPoa4Wf2F5+lpUd1XrB5rVfAdW9VF9jYfag7Rni8ca85 o8UHHhn7/MplAimWKOZqhXWRnAE+pSPcM44MSYuuqRxkzk3XV9FmWduAgB/+X56Qrw5Q7ri/Iks wTrJS4pj0s26QCqygCFHffq7d5iVDe5QIo71F2r/ X-Received: by 2002:a05:6a21:3a4a:b0:1f5:67e2:7790 with SMTP id adf61e73a8af0-20e966057a6mr6754727637.17.1746409955584; Sun, 04 May 2025 18:52:35 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3920074sm4462101a12.11.2025.05.04.18.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:52:34 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Peter Maydell , anjo@rev.ng, =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 08/48] accel/hvf: add hvf_enabled() for common code Date: Sun, 4 May 2025 18:51:43 -0700 Message-ID: <20250505015223.3895275-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> References: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x530.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'))