Received: by 2002:a05:7412:1e0b:b0:fc:a2b0:25d7 with SMTP id kr11csp972657rdb; Fri, 16 Feb 2024 00:59:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXzaJpQdAfuEIA5bP+05bEMJnA8bF+OdELfr37E+ukwkDsjGMg7h2SSHNgGUzWgCbzwOm4et+Ss8B0zm2lHbDtgWHfxv8zRWQ85xSKSVw== X-Google-Smtp-Source: AGHT+IFaGwX27bQ74+l/O1PheeD1IH5Z2Sh25P0w7nDNFmHmIcJXW/vexpZYGHN5jN4RcA5XlomK X-Received: by 2002:a0c:e48c:0:b0:68c:ae6d:295c with SMTP id n12-20020a0ce48c000000b0068cae6d295cmr4381348qvl.0.1708073950736; Fri, 16 Feb 2024 00:59:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708073950; cv=pass; d=google.com; s=arc-20160816; b=F4ja+TOFEXHQ6kBrflix0j2/WY9WekW6tmmlCyadU1tpy0V+Ki1tyvNzbzH891WE1Q Odp/8lnBUjTZPIPvJll6mYcIavdFJvsVJDREamSwSTzuubASGqq+5ZI0NRZcpws3f04+ PIiCh/mBA3tKCWUV/4Tk5ikBZyBjkzo59qwAkEvsVyk9/ZyQuiaXqg9IQkUlemSDztUQ weIsmQsM6wOqgn9zjy96GSCOaTIRxRQSsT/Lmh5LpVyasVMZyiHCap4D5FALvBPcW7Ac uOO58xn+JUAxhvM0UdWSPDsN5b4v2hf2ZYpZtjPNx69mrYrBLpzUJS4ZXP6cwmScbnEX vkrw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=DkH9ejq07vGHbyPo3TpqQmkSi0eNHPrwybjHFojCM7Q=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=XUwBZ9BPhiPVz0Eb7lSIcz8Ba0cW/GgnWL7M/wKJ1hCVdWXkMLSh8q5cxGYeXBwiyH mLZ3Q89ehYOs8i9v0YcRoNBUVb9bA36R5cJKzSwy14mSIKUYZi97JwSt2ZaTWPB2sFtH BQ5ewiDm0pJK4rruTQhqkxhPXJ21+4rpgTvGXS8wea3G6cNilRzjTgeu9sJIRQwq5QJ0 HMINdbUcODopHiKyqPxbQiDvmRLGRr41NwYdxCMpsKkcjYGSNaAyo6ksvQ7V+Qi5YM6e aPmZ3P++RkDMrDjYO/hgBixUfirLmq72Bv/VZNbDeoxZutR2e8BY0WHlzhPPdEtrXkCQ bLIQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=F9bXnQpg; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-68290-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68290-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id q7-20020a05621419e700b0068cb7b357c2si3488161qvc.13.2024.02.16.00.59.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 00:59:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68290-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=F9bXnQpg; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-68290-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68290-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7DCFC1C21362 for ; Fri, 16 Feb 2024 08:59:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79A111BDD0; Fri, 16 Feb 2024 08:58:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="F9bXnQpg" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E9FD1B95A; Fri, 16 Feb 2024 08:58:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708073916; cv=none; b=oMgQsztKDh3pWAWo6IDH4sA+jMyE/pJ3uJYNE3cOCGTQHmbbs5ngYZz+BpL5V9AWLY3P/BAKOmt2FWMyZJ2VJKrRwtI9Em2LqdztiIMvKTsQ57XXG0gSvuzDLlCSOO8+/W5H9jt9EvgZ1+JB4t/xO1rj3MLaywEJ7qJ2677X+3Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708073916; c=relaxed/simple; bh=WzF4cixCPUKQp/NgbAjzvNdu2i9KtmYFWq3pDpAX4VY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cbb4S3nfeRtD0kTYpsz6or5vK3OMZNpn3tF9VmBQnCpssXwNfJi+2dFRmWYztwKjaFwYq7gKbEpkwEot7yX237v8mzGlVLlP/uQN5kNFB0gWjobSnNwwYpZidtXm9J+4QZ63vzAbTlWIfXWnC1IS1bdbMsPIb4WxFFotBF3K/Ss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=F9bXnQpg; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1708073911; bh=WzF4cixCPUKQp/NgbAjzvNdu2i9KtmYFWq3pDpAX4VY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F9bXnQpgwb2FtaeGfQJodNaSJrq9YUMnHgqBlv1a4o/9oaEQ+z9VH0GKcx9O2cwsK EBzBff4UhzVOI9FHYClUt+t7QFrJVSIxCwOLyQqcqfSlm9p06pl3ry2g05V49biFwg 1vVq1ctq3TmPlJBElaHaf8nu5dRM10xhtdyE3tKI= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:cda4:aa27:b0f6:1748]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id 43BF8601C2; Fri, 16 Feb 2024 16:58:31 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v3 2/3] LoongArch: KVM: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask Date: Fri, 16 Feb 2024 16:58:21 +0800 Message-ID: <20240216085822.3032984-3-kernel@xen0n.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216085822.3032984-1-kernel@xen0n.name> References: <20240216085822.3032984-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: WANG Xuerui The function is not actually a getter of guest CPUCFG, but rather validation of the input CPUCFG ID plus information about the supported bit flags of that CPUCFG leaf. So rename it to avoid confusion. Signed-off-by: WANG Xuerui --- arch/loongarch/kvm/vcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 56da0881fc94..d86da3811bea 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -298,7 +298,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) return ret; } -static int _kvm_get_cpucfg(int id, u64 *v) +static int _kvm_get_cpucfg_mask(int id, u64 *v) { switch (id) { case 2: @@ -335,7 +335,7 @@ static int kvm_check_cpucfg(int id, u64 val) u64 mask = 0; int ret; - ret = _kvm_get_cpucfg(id, &mask); + ret = _kvm_get_cpucfg_mask(id, &mask); if (ret) return ret; @@ -563,7 +563,7 @@ static int kvm_loongarch_get_cpucfg_attr(struct kvm_vcpu *vcpu, uint64_t val; uint64_t __user *uaddr = (uint64_t __user *)attr->addr; - ret = _kvm_get_cpucfg(attr->attr, &val); + ret = _kvm_get_cpucfg_mask(attr->attr, &val); if (ret) return ret; -- 2.43.0