From patchwork Tue Dec 19 19:12:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755985 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1603980wra; Tue, 19 Dec 2023 11:22:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMzfWAT+Gpl3INBn2a8emH0UpBmouD+ahR3GobD1RxtBRYUiRwIy97+zDuvZ/v7v2wdbKM X-Received: by 2002:a05:620a:1d94:b0:77f:9540:56ab with SMTP id pj20-20020a05620a1d9400b0077f954056abmr11700629qkn.123.1703013730697; Tue, 19 Dec 2023 11:22:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013730; cv=none; d=google.com; s=arc-20160816; b=L9HHRnuFw/yM54rAs4W3JlvupQTyeqKv4k/sEfM+hWe/oKdl1mrrVSbqPMb5scuyfw 4PGEur9amE2+SYDDVGE5TGAP9PZuE2TqDXEFZ3AhjrDCMWtJStvV6gvXC2EEORtLfYc9 /vcGIIR60b2DVBlDcBBnUV2WmoKR54Tlv0vjLuhhGFokCa9jQwY8xf6qOxl3Qu54aI68 rymItQo/TQJBkoR7iUkCdh07MzKBki5AHXU1yJBJfoEtPLX5v556lfvrrEqBEzcLNQpo W/zUgHEAyWR30Vx3skDX1hDyMlFEwE7kb10MJxR+fc6BTUXcSwPoZ1JM2ZGTVaSDo9pS VKdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from :dkim-signature; bh=Ak4CxhUk6h6TwjSSh7FmGz1AnjJa6mERKfsGXTlTv5I=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=jS/zdNIA+REDRrLtSlOvF9j1EQntg5KgFJwUJheHYNYdNqiwMD0jL5WfmqrjXmQl5b ol0PQrVANZtVV/N5DrwuYR+wSEoI+6mSOOmFcd9kdatu9KaLn96lZOR+k4/tmlJj+Cxc 0R6xUl5+rdq5V5ArgaIsTfcY9gcZxWqJcS7i3ZbYfarK+TERrVl/9UESwosFCtfmVNaA YOYb0xnCvLluBzF2Zqmh1lY4eKfKtf3A8Wfhsk0eH0JM8gCPH0VW6WedSqFKTBrqh3/d SVjh3+SQYE6s3gLYwcyGdvvhcSeHq84yzFUEB5qdKoz0q4S+JLSCiYRC3/ddbxfCUX8r JMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iU+Oe0L0; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a29-20020a05620a439d00b0077f03b8056asi27473775qkp.222.2023.12.19.11.22.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:22:10 -0800 (PST) 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=iU+Oe0L0; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFfWv-0001ve-H8; Tue, 19 Dec 2023 14:13:25 -0500 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 1rFfWs-0001sx-35 for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:22 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWp-0001oG-MS for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:21 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40c580ba223so61798725e9.3 for ; Tue, 19 Dec 2023 11:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013198; x=1703617998; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ak4CxhUk6h6TwjSSh7FmGz1AnjJa6mERKfsGXTlTv5I=; b=iU+Oe0L0YTfviGJej6mIaV3BOcQ+AfabeQf621bU6Qc6Px8izwf/H18YdN3vlrNBm6 z7eJfzmKYDHtYlPQaAaWpkARMwS5sLtRFT7iURpGaXwMkyGJcr2CaAbre05rj9lDh/9a 0LgqWR52huOm+nH8JDLuYLgEdpXfs8hrfqeLSN7tKgzw2RzfBbqvFV0+enjhF9aunl6F Spfh22bvSyK4t+oHb8haE20SpIJKGRsOLfBx6EmnPlpFz+hIkw7+nDl6ImuHhEZf2ZO6 uMZ2ZpUIqQO3ibReaQipd3ViZQ33jFzrkULLWwx9lmjsPO1DaFNbc7JXV7gjNRrfGFAJ 9+1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013198; x=1703617998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ak4CxhUk6h6TwjSSh7FmGz1AnjJa6mERKfsGXTlTv5I=; b=Wxd+3ZcSV8DEWd8MJT6fXe5HRxqSHr6djmE1Eeqid8w/GiGnPxB4sPZqj17hfb1OQo +z6lv/kLQvVoiZc618RTcOIflitLgvaqeqy2Q6sTXdmyNtWpdrBHQYbxXl3+3m5gbxFt oQSzd/AUm8hMBkx5CYXdAFhW7d0xohB/KyAs5v/X6pO6gcQcYxj/DnP0HX7lLvUccx/y pfNL7E2P7O7It0V3hijEVOSaozauzrE6jkQFo60L2UI1sjw1yP4cbC33ijzc3jenoUZP qsu6jmPYx/K72DhL4sb+bUnVabF0csN3ekfh6ovq5ZeDegc3oSMwzFwxEMRXMh+SyFPb 6Ycg== X-Gm-Message-State: AOJu0Yyp504XNOyaNwFg1rM1YzYqKqj5w+LKw+4u8ToF7PpAG++lFNMr cUyNqiJ59HuE4Q9uQ31RVylsg2UKWuBZQ8kMrm0= X-Received: by 2002:a05:600c:450e:b0:40c:3508:b409 with SMTP id t14-20020a05600c450e00b0040c3508b409mr10051256wmo.111.1703013198419; Tue, 19 Dec 2023 11:13:18 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:18 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/43] target/arm/kvm: Unexport kvm_{get,put}_vcpu_events Date: Tue, 19 Dec 2023 19:12:43 +0000 Message-Id: <20231219191307.2895919-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Gavin Shan Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 20 -------------------- target/arm/kvm.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 1ec2476de7b..b4339d49d11 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -98,26 +98,6 @@ void kvm_arm_cpu_post_load(ARMCPU *cpu); */ void kvm_arm_reset_vcpu(ARMCPU *cpu); -/** - * kvm_get_vcpu_events: - * @cpu: ARMCPU - * - * Get VCPU related state from kvm. - * - * Returns: 0 if success else < 0 error code - */ -int kvm_get_vcpu_events(ARMCPU *cpu); - -/** - * kvm_put_vcpu_events: - * @cpu: ARMCPU - * - * Put VCPU related state to kvm. - * - * Returns: 0 if success else < 0 error code - */ -int kvm_put_vcpu_events(ARMCPU *cpu); - #ifdef CONFIG_KVM /** * kvm_arm_create_scratch_host_vcpu: diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 4a5553864a0..b8923fe1776 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1090,7 +1090,15 @@ static void kvm_arm_put_virtual_time(CPUState *cs) cpu->kvm_vtime_dirty = false; } -int kvm_put_vcpu_events(ARMCPU *cpu) +/** + * kvm_put_vcpu_events: + * @cpu: ARMCPU + * + * Put VCPU related state to kvm. + * + * Returns: 0 if success else < 0 error code + */ +static int kvm_put_vcpu_events(ARMCPU *cpu) { CPUARMState *env = &cpu->env; struct kvm_vcpu_events events; @@ -1119,7 +1127,15 @@ int kvm_put_vcpu_events(ARMCPU *cpu) return ret; } -int kvm_get_vcpu_events(ARMCPU *cpu) +/** + * kvm_get_vcpu_events: + * @cpu: ARMCPU + * + * Get VCPU related state from kvm. + * + * Returns: 0 if success else < 0 error code + */ +static int kvm_get_vcpu_events(ARMCPU *cpu) { CPUARMState *env = &cpu->env; struct kvm_vcpu_events events;