From patchwork Thu May 1 06:23:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886297 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp173883wrq; Wed, 30 Apr 2025 23:24:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxmJ2LANP60QHDLrRYlH9PNRCRD4NlE3vY18pmpTlr8Q2ekptTKpi5kB5yPpy800XzlHK0NA==@linaro.org X-Google-Smtp-Source: AGHT+IGZnkractuDv5t483tcst9Dg7dGb60J5eTKvc3xwvolqX/2DDW0E9uiBcFo7k+FWszaIwSR X-Received: by 2002:a05:622a:418f:b0:477:88c8:9907 with SMTP id d75a77b69052e-489e46a4504mr92794881cf.2.1746080686857; Wed, 30 Apr 2025 23:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746080686; cv=none; d=google.com; s=arc-20240605; b=JdSMnXAPVbTEqKeOIqnJw1qQ6O9kyYINGwqwjBcLvnxPnU7IYuc7N+vZ8QKIZ0SiEM 0jm+jkEDLtviGv6ScIPJJbSr8vZDKqn8PYk2wrrBzpUe4uwfGV+xYsqAEPR+yIKUfhQD QvV9BYnYDxAwH4lzRrf5TkA2rt8w/EqpWM75zYqco/v5FSUkB4Y60gVD2dYJxBuzS+8B 3lECAaMDTOa+5owcWQW6PDGwCbC2yEbhl3l+fffsvx1AsYFgYwO1dErXDKSNrIKwMXGg YgGQDwBQp97RrGKfYF0t5SsRcRPe+RrCkJ4zV31ZiKN/Fpj4sUsMoXpJX+1UqmP+tOh/ kxag== 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=Fszn0PKjr1lTJ9agfldZI0BguDyTJI4MYSL4G/fcmsE=; b=IjkHEXACUV7DXMHZhCD/d0tGaNarYtqle+vFKuOodlSlrTc12o37LYi9pqeZ3hS1wr qroppZ7IoAl0vULL6CvGlPAnM8C3UIbhd6WWyPSz9PCShweGP8fEkkNfB+ccjgooPWHy ZgP2E8/BdbopEfx1jOIJQJgQa4OPecrntrN8ptaiG4osDbHOoFWZSHXLVB/cg/xViSyj MAVECkta0c4sNMrOeMM0iJE12ON5Z6vkV8/pbv8XhfAjduuKAiroRgoFJOfGDpZpL2IL rDUcaBjLqanTSLehJB/5O44OoAoY4+o+OYw6wfH/tutOLv2ZW+aCODzMtqKX9tyvZdae RvNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O3mLLUZv; 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-48b0661c04dsi10996941cf.131.2025.04.30.23.24.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 23:24:46 -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=O3mLLUZv; 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 1uANLM-0005EY-Oi; Thu, 01 May 2025 02:24:25 -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 1uANKw-000579-CC for qemu-devel@nongnu.org; Thu, 01 May 2025 02:23:58 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uANKu-00071j-CI for qemu-devel@nongnu.org; Thu, 01 May 2025 02:23:58 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736c1138ae5so707369b3a.3 for ; Wed, 30 Apr 2025 23:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746080635; x=1746685435; 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=O3mLLUZv0Ut7AFOjAS7jUoDBNd3OMI7YzSM25IV6ThFXVW6AShT3R2qNmgU2UK+vVL VKjqtkQfalFxyvZSkPwFeSin4h4QYf2Zn9RUyqNy08wNYYdvU8D5BnV9OcUDPgkHpnkP 82Gw8qTrep/HxqLtS8Qa3FqdHwLfs8gakbsRIYeL/vHh+JyezBsrJuPm8llCn4xD/eUP ygkTX3hBQxIipL0jCoARDTuDGIsSoO8cRjSwj02UQMI2wpglsxVJWLVVC7yF2yPpQHGa jQ4qFkZ7m1vFnbHdHVsydVz2DaUY+ZKZIPwKL8soeuOkrODWPqtxEPLB9fPVL48OVjlV BeIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746080635; x=1746685435; 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=i79nwTUe8YvtGsBW0Pwad/rrPdBsZ5b0PKW4XL1kiBXkrBroHWudVlbDOqjZ4tGL0M 51YFj9GjR5NWDs5etj0zaBP2SPaRoNRuUVvbamc3saA/WrE2XjvukziwE5eXUedjgcPl rviUqfUMEUlcM+Ypor4KpSUEJrL1q9OAFQIlONPwJINbKMtXTl/PiVkfvcMRiqcc4+hk e1U4LmmtIJwKLQWxMruj7cgbv/4j7Q7lg/ZOV6UtsykC90ltZDcsmUQxGIiNMMs656Wi Ntg4l89L80rPTEFHhQf3kAS6TmyI8844i0YH9yLCOWmSvbxYOicFa1kmFgXskf473MHL o9MA== X-Gm-Message-State: AOJu0YxHGL2Qro9JvJlQCFc1bSGFAfGsctbHHll2KX9HcPh7t3so6TLW 4llt6IA3Gz/KMa000N2QXaHSueEn5sIpU4z8VIxGJO7L0jHbnegcxenhCj91NNRa9MSrvMDuc2x z X-Gm-Gg: ASbGnctHphpU0hOkyZ4Op7TXRbE51+Y5Mazxo8PSJ33cPWqK8Pp/wpccSj9bXJ+fTrv uujojl0B8e8/0kLPnP3jO181Br5j5Fak2RZ7YstoQuXHgGnIIXhN+ISpWDV4Fb+drUH/Zch6EBI cNvfJQCvMok476vbFC0xoVA7L/71uaUKNft5yORjmTEPEXNovoo90nZOPANy7idqWuODiLrqyZk yO43PrAMRThy3E89W6dK9zkaylF5INswcphXBb67g+sBHt44FVIyP6peo6myRhHDUer7Qr/wzIh suYBmdivV3MECrtBwVIz4FhdWZo/xUIVDhG8hOEA X-Received: by 2002:a05:6a00:3997:b0:73e:598:7e5b with SMTP id d2e1a72fcca58-7403a75b2a8mr7324415b3a.1.1746080634976; Wed, 30 Apr 2025 23:23:54 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7404f9fed21sm108134b3a.93.2025.04.30.23.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 23:23:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, Paolo Bonzini , anjo@rev.ng, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , kvm@vger.kernel.org, Pierrick Bouvier Subject: [PATCH v3 04/33] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Date: Wed, 30 Apr 2025 23:23:15 -0700 Message-ID: <20250501062344.2526061-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> References: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x430.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(); +}