From patchwork Mon May 5 01:51:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887405 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1824300wrq; Sun, 4 May 2025 18:54:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCUL6Gv9SJYMXotn/AM/BQCoQoYSb/Ukxrh5zPbb1Kr+ii+eHmglqblBfWa6X65RgJ0BTwsA==@linaro.org X-Google-Smtp-Source: AGHT+IFQEdUgNU5hIELBi/3GJIfm/1DQEeQUkSsM5zBCuEkFCWqj7JQZKvEQ8HCJMDMFTHEyoTKn X-Received: by 2002:a05:622a:400e:b0:47a:e0d0:4f69 with SMTP id d75a77b69052e-48d5c49c4cdmr144893611cf.27.1746410048450; Sun, 04 May 2025 18:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410048; cv=none; d=google.com; s=arc-20240605; b=cyjrDMyH0FnMbnKPC7ACtMHRJE5BEbmz1SqYvjBSBbMSsAbv/81lYvzkYpi+/bNRr5 yWHpAuJBTaw5awe9gVCHiewEW0KjjJI1mvzJULgzMMwxRQPqCrzKWYsC7bQPoBkdQ4Nu C4oi+/4LsKwr4cdNdk0Ps2GLE+PQAFzYSDwrIvE56ooTnCFCJ7gGYeOexOr9OS/SVmWv 6ksLlE4CVYqF5djHT/0ab1TKPNVNLLiqhhUlopKC3qaaOymcUPJuOWbyiQQ5az1XNFLc YTALAaF7cp+RdeFRvrvSUqcJL2hwaxtKPbzw0hwgP5dpxOe8qZLLhUhEWGfyZ5fLFsOB wTcw== 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=Ktcl5OZ+t3GMcQQ7Jgx3PtMsJ0l/J5yPLlaHDm/4GNI=; fh=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=dq87wQyM2JB+xr8Uhibw9I1/EPMwbHEibLWoOQILs/0oiSeH7Ol2ndtBhj/1cPbuGb mNRUUyYJF7CkX7ll7fxmQa6ivblGSnqrqqeEjSvrX4d8Rempy+T57+ETJ19KoqIGebE6 do34OVRpD0qNeDUjlq8lR/irq4Mxo9UBAaWd64xy4FVOOY8oN3eoFMf6zqgeIKaHJR78 X6jNwT7GY1sFuNuTWlarqKRuiK/2u+ww1L0WCKcWDLZXCxwx9T+gu1B7cEm0t6dxxJfB WEIa8JB2MIEfdQTVbR5mvqsnDSPKKjP6gldgP379XXJtVIF1fPg3q+Y+m0sfLez6WbU2 hUqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fyZEcTRJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48ed66a7b4fsi20165251cf.357.2025.05.04.18.54.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 18:54:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fyZEcTRJ; 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 1uBl0k-0003ud-F8; Sun, 04 May 2025 21:52:54 -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 1uBl0f-0003ts-Mu for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:45 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBl0U-0002UL-1a for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:45 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7376dd56f8fso5228123b3a.2 for ; Sun, 04 May 2025 18:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746409952; x=1747014752; 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=Ktcl5OZ+t3GMcQQ7Jgx3PtMsJ0l/J5yPLlaHDm/4GNI=; b=fyZEcTRJJ1Wa4dQQM4bMbciDicrxUNLJknwBa5Hest/YmXhr8D/Dxp//d/B+YfSt0G G0GurcRFp/94i9etOTG7HurryObbYPq/8KPzSWhi6opImpUVvsHmm1X3mWKBtZqraio+ F9aMD/eZICNqYn1IpCgswv/zyd+phDIjbSeves+7moQHO/6UCp+nfXJh066jTiX5n5Yc MXRUMCmQQUpSB9SXDU8PQo9er6xvCazpfVn6xNY8o5jn5xrzrrlvBXJSmk4RlPhDN5sG jzEstqjEjDtALVnIqyURagm2vWXJWbWttmF4wpEhQdSyb0yYgh9aoxEbie0oYcOAMw7L 1ABg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746409952; x=1747014752; 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=Ktcl5OZ+t3GMcQQ7Jgx3PtMsJ0l/J5yPLlaHDm/4GNI=; b=WUK5+IkbYHqTewbYWzXiShCiQw+xLNPqYUjwe2297C7N23re2x2k1NNmdaMcUbWBUA S2L/JOTFz2h1DdUAE48aiZsIp0cCoYi9qCpBti6h28C03axWmjW2ehrCvN3w6uOYWwrH JGmrs8vs0ksYLPWyyeI5/IEjTD5aTc6G2pn+a/w6fLkHOOH2rY9unSHkRf6nz/j0S5ex je/Z0ngEGufp/01RbUwSBHW039FymcviPUnwVz+215sDS3HV7tH63kam3jfSAy1dEG5b swN7wpoTdbkFeAwKUL8pOGhrA5QMrPpTCdXmj1xwZIQRMnQGjv1hzd8dd25xyEnOG3i+ q1Vw== X-Gm-Message-State: AOJu0YwGMK09CgDOTxEC7TfTGiX5cFfX4GUwxk2uKlF5ejSrBzZvmyTh 6VdhWbi5aRKebXQTa046sWilyaIvrGqLfqAes1krU2hen9ncGB9GY7tT5JOBU5KpD+5ncIuzB0k v04g= X-Gm-Gg: ASbGncsHMqO9Vi8/dWRPiBRljmXq05KBGh1EsKDOwgI4OYsnF7k2c0pEeNx5uLiiT1C uH/l0PzM8kf1z95Im8LCoSMAj2ipjHHdpEYt6i6QZK7o0WNbzqQyjcATqnJaYM6u7T7D50gE8KG oTXY738PobS9zepKSLqC7kjKd3Q7Uept53ihspzYbqNYplVj3YVH+5F2n5XJU/WvCSdM/M8mk9G WtzDq755zTtP+cwpHU2m7OrE+Mf/VNkN3Cahm07ZZT9EFO0oApppwT0egiuWv+YffpvJdBnGBx2 hrUJ9EdxLnmj/msrRqccolmmb3xOQa08vYXsxpejd+ywFBG2/5Y= X-Received: by 2002:a05:6a20:9f4a:b0:1f5:80eb:8481 with SMTP id adf61e73a8af0-20e06436606mr10495461637.13.1746409952595; Sun, 04 May 2025 18:52:32 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3920074sm4462101a12.11.2025.05.04.18.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:52:31 -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 05/48] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Date: Sun, 4 May 2025 18:51:40 -0700 Message-ID: <20250505015223.3895275-6-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::431; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- 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(); +}