From patchwork Thu Nov 23 04:42:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 746463 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp688889wru; Wed, 22 Nov 2023 20:46:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IESDiwVc2ra0VeKmZ3RV6St9nLC5uWwAZ04ZL1N21T6T3+bvDect+jFmH4oqIOJ8FdUzkm0 X-Received: by 2002:a05:6102:508c:b0:45f:1349:fec4 with SMTP id bl12-20020a056102508c00b0045f1349fec4mr5611420vsb.20.1700714791070; Wed, 22 Nov 2023 20:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700714791; cv=none; d=google.com; s=arc-20160816; b=VjWKiMx0M59KxRbSlIOwtYA3fcA1U88dOO+IARc9pr+wGuIsWEhfYlYWNGkDZjmxBs koCrX/Azya/D0PczbBe5us3CJLSijnwWty7jJPdhUFeRrw9o68lq72jhQmMwe8TB9tPV 6a/wd0mZS5l2tKVnSHwqHKVFaoqTeBJffY0JQuyUNHLVaZURaPIvhzak/F9+lPsFXjY8 4F3Ml2w2W1iwggkSoQoInKcxveFW4PREDndkny8+eeHaxuCpgobM29qYSziC9spd5j2n vDGdjXXH3YplrlYt0zMiQa62WC8v2rMNLa2O+qVFWOb/WIxQx4/n9Kphv69w3YpyQuGB ybsg== 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:cc:to :from:dkim-signature; bh=EiNpx4DVO1rGLOpbcBfDBEuJhBAvBoc+N7iWO5VmOEE=; fh=9Ev+QBUhk6P6vR3LT1wYeDLexozsz44nqjfoyPajZCc=; b=JBb2bHXgiy0CHyXW6Obv9HFB4NJO/uwH1Tpa+r5H8zfgNDsEnhjhMMaV12U+tUPMvl nkJi+mePFwrpDn6NMLrtnG/8KkgUR1bvSZERse9BrzCbyTsMyVNhpiaHO5MJDGu7XtSu 361vzD9IbYDqjp0hasY6ytMK13PAD00xLIvpvTljOeAayWQ02Op2isr04af30GJpTWiU 7oVAMeUbfUSGtDQAr05OWYbi0rsVyXybaZ0dyGyWFC0ZCnZlEmNp2BMbdXyRQNQLHVtM s8rkHmLPZvMIqQkoZW7MMzWOfmAF31apT8Tp5HVgy24SqUzmQ0LeqA4Kta4EqJtf6fFZ OJhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="NTwJuNk/"; 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=fail (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 y10-20020ac85f4a000000b00423807b1785si430751qta.605.2023.11.22.20.46.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Nov 2023 20:46:31 -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=fail header.i=@linaro.org header.s=google header.b="NTwJuNk/"; 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=fail (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 1r61YI-0006ZS-68; Wed, 22 Nov 2023 23:42:58 -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 1r61Xv-0006NM-4P for qemu-devel@nongnu.org; Wed, 22 Nov 2023 23:42:36 -0500 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r61Xr-00068o-36 for qemu-devel@nongnu.org; Wed, 22 Nov 2023 23:42:34 -0500 Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-3b842e28917so287655b6e.1 for ; Wed, 22 Nov 2023 20:42:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700714549; x=1701319349; 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=EiNpx4DVO1rGLOpbcBfDBEuJhBAvBoc+N7iWO5VmOEE=; b=NTwJuNk/9NzC+EtIXoKWKaROf69Iqf2dmtqUG7X7AdzRZaI5lg3QwOKUonvPUvLajO GpiDQUKfkGswrOv1VkovgAPA7mmFgzcBtu2hbGaMkwDKUoa6lMvZTANJcW10SSh41eTD 1wMuDxG9cwTFG/oBGydqQ51Gnnw8ESPc78dQB+RSwVU+GgnvW+25+ZRrbDXoJPglHPq9 PNJOXB4HPjOhplVk3fLamuMPMB6mdQe/cQDNSrpIwvPYnBQWLN0YA+hAgIHL3SZgEvP1 I18r8Vp/hZeEa7FSyPqJGGVUVlLme6E0GMdB5D4yB6qrILrIFMopXm0DhQ0eVteEFr+D F8SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700714549; x=1701319349; 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=EiNpx4DVO1rGLOpbcBfDBEuJhBAvBoc+N7iWO5VmOEE=; b=mQpE5YDCGQLdec1aI7lPAdzgO0k5KULuZkWeRk9iWPfTJG7EXAtUWZj1mYNVGLhJPw 6IeYY5Gb2ACDmor/O8hp+q2pieF5eCdunpEUrqFdC+TwZwaEfEwSzXzHOYISq13w6hRd nTWCqH9aJ3KdPcQ54vSDRLCx8sL1y5DxR8guA16plVpjmxshFo/5smyLuegB9xLhgqtR ZFFBPADfAuVaHA/MdtiKOOgKBAwF3bkgCPIrz2CL6RcSBla6innCYZy40Yyo3jTukNAy 7Qe5hCJ9TuO9YfiSn9iTBoFOa0z4FuQyy+8Z/zgSE0Nsw656SJZ7jmoZHd7Uq3XRlqQ1 cImw== X-Gm-Message-State: AOJu0YzocPd+AjSIvVtXdTGO5rz6jJLX6oob322oKeTkb8wYatbbfXC3 G4IwqBj0157rCKz8IQwze7r+pepruqLEZTGjskCWUfqD X-Received: by 2002:a05:6808:1247:b0:3b2:dd32:2fe9 with SMTP id o7-20020a056808124700b003b2dd322fe9mr4916569oiv.35.1700714549632; Wed, 22 Nov 2023 20:42:29 -0800 (PST) Received: from stoup.. ([187.217.227.247]) by smtp.gmail.com with ESMTPSA id i7-20020a056808030700b003b8347de3c2sm73888oie.19.2023.11.22.20.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 20:42:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 08/21] target/arm/kvm: Unexport kvm_arm_{get, put}_virtual_time Date: Wed, 22 Nov 2023 22:42:06 -0600 Message-Id: <20231123044219.896776-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123044219.896776-1-richard.henderson@linaro.org> References: <20231123044219.896776-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Gavin Shan --- target/arm/kvm_arm.h | 16 ---------------- target/arm/kvm.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 9fa9cb7f76..e7c32f6ed0 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -335,22 +335,6 @@ int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu); */ int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu); -/** - * kvm_arm_get_virtual_time: - * @cs: CPUState - * - * Gets the VCPU's virtual counter and stores it in the KVM CPU state. - */ -void kvm_arm_get_virtual_time(CPUState *cs); - -/** - * kvm_arm_put_virtual_time: - * @cs: CPUState - * - * Sets the VCPU's virtual counter to the value stored in the KVM CPU state. - */ -void kvm_arm_put_virtual_time(CPUState *cs); - void kvm_arm_vm_state_change(void *opaque, bool running, RunState state); int kvm_arm_vgic_probe(void); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 55e1b4f26e..84f300c602 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -704,7 +704,13 @@ int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu) return 0; } -void kvm_arm_get_virtual_time(CPUState *cs) +/** + * kvm_arm_get_virtual_time: + * @cs: CPUState + * + * Gets the VCPU's virtual counter and stores it in the KVM CPU state. + */ +static void kvm_arm_get_virtual_time(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); int ret; @@ -722,7 +728,13 @@ void kvm_arm_get_virtual_time(CPUState *cs) cpu->kvm_vtime_dirty = true; } -void kvm_arm_put_virtual_time(CPUState *cs) +/** + * kvm_arm_put_virtual_time: + * @cs: CPUState + * + * Sets the VCPU's virtual counter to the value stored in the KVM CPU state. + */ +static void kvm_arm_put_virtual_time(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); int ret;