Received: by 2002:a05:7412:2a91:b0:fc:a2b0:25d7 with SMTP id u17csp471355rdh; Wed, 14 Feb 2024 02:24:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXJTCIQVkORrPgINhFuf+2sNSIQPdhLtdPpubluGiFeBNijcyYv/swzaL4gRYHWB49W209O6UnnqXKDoTRpPbnVeYJNaoXpFAqf4ctCsA== X-Google-Smtp-Source: AGHT+IGlrlD89Vr7geW9RcM5PCFvCot5XmAelB1mooCrDrfAPJFFG9bdJTAd2AY/lMnLthI6eDiY X-Received: by 2002:a17:90a:ea0e:b0:297:198a:8c3a with SMTP id w14-20020a17090aea0e00b00297198a8c3amr1822807pjy.3.1707906264692; Wed, 14 Feb 2024 02:24:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707906264; cv=pass; d=google.com; s=arc-20160816; b=hxrKCSVFZe4zlnDCb1UFOjup3mXo+XVbm6HFKViMRW41tSeM3JYMQy0keM9USCfTQq MEh+82jdbRBMjxJAHFMNTD+idXxNgdFbijB1y/kZQCJkekRO5o4tJymLQz+Dz3Mp0ofX 7dmDT9UyU6cx48X8QJRyKLHbeyNUxMWgZrHW+uWR4xuPzFizP3nUjzVDT91oBGyCcCcU 08Xloe8DWHKgSyD6lphQuGYuczhPOd2f94TV4FyuEAORMJWvGPdKSEkXeJ6gMVFp7az7 Ateg09E8Zp3n3eXeom+TTnCnVhj3smkkqnRZXvlz8Y+v5Ps8cDEAd3oFVt17TmP1ysGx MYrQ== 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=Pyj7psfQ9omEicu4WWM5idDO2TxPx1IprjGbZwJCuzc=; fh=lKQ4TjzGMrEVqsi77Y7+XlndgnGSv6+MdEjjwROhG9A=; b=xzO35j8sN9DX+khgSk8bsVohEEDJ+bPHAHG1EvTJkQGjAVZ0MlNdrzx/WcSDyV1OOy rRPpQaDYZ7jxLwysHPqsQntxmejDZTSBT1RtBzoXYdbSlwZOTSuE/lhczzwy1VSXOClq Ty4IwwCdvl/zDufePM5t9lI8CECdz6cbpgR73l5kI8Vnq/W/gnTOLweAoUAFoCsbZLXF yumq6hosFWD2DSyv+zZnaQX49jrDmT874ai4oNxwcxslTQqdFyXOvA0v2Tz28RsCoUzs dMA/s6w3Nnj9I60IR/mu0slTz9e4Vbi1y2XhoFi8F9by/x7ZTQZvmR0gW1iDkXSVXp1f VQNA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=xPELIX1z; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-65041-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65041-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCXCdNxSFgMRSW2HbtYO8dDsckCas/GAOzczT+/3KKsxaQJyX1oNJRMw7HgZc+BoN/GfbdI3QuwQOjY36qD2UpCQ43+V8UMolyBcB8EZUQ== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id pj8-20020a17090b4f4800b0029704ea3479si965045pjb.77.2024.02.14.02.24.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 02:24:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-65041-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=xPELIX1z; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-65041-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65041-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 5761828D5F4 for ; Wed, 14 Feb 2024 10:24:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 266B117C61; Wed, 14 Feb 2024 10:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="xPELIX1z" 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 69EF417543; Wed, 14 Feb 2024 10:24:08 +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=1707906250; cv=none; b=SoXmaCXK9rQpVW3t6Vb8EMC7SrdbRiGIZJaViMjwUlghGAeQHSOSbryXgyNRqfjycHiDNKrwdFLqK1+HkQ6cFbKa9KOHbSyku04R+OeRzCj3u7jMAshBKGUxWW4wkNkxriWGpqcwDjk4rUoMSq1Spr8GfXZf08Ed7alNQ4GJMaA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707906250; c=relaxed/simple; bh=VP6OWLTFU7Iwj95xAdgUR/i01Q0SJTbE9ZgKz6xmu84=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EPAOii1fmPeuRZOpE7A6+TNcPf4Bc7EZ1AX9sxvdom8ChFT5PDvD4VGJcEbtbDpYjGAEuMAfww71faeODfCDVpLJf8A7aIEzrxq6t7jNfGnodiXBEGEKkFUWUyFBqGo0BaZDohAYDlGV1gHeKplxYa7RYz/6U3DAyldga5oiSZ8= 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=xPELIX1z; 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=1707905767; bh=VP6OWLTFU7Iwj95xAdgUR/i01Q0SJTbE9ZgKz6xmu84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xPELIX1zkthuNl7p7i0jC+9O9gRLMpQR6i86bz0hw432410swsodTqRxYGqmArAK6 ooPVVN57ifBG3uEKJHR6S+7CSg8sgzPpIgku7G16GDft5x55pLkzQ5NtxPHNx+85dB sp1BmohNFFBTlvOgjn6QhkdTa/VuOM3Scq3/9Vos= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:5531:eef6:1274:cebe]) (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 AB9B5601C2; Wed, 14 Feb 2024 18:16:07 +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 3/5] KVM: LoongArch: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask Date: Wed, 14 Feb 2024 18:15:55 +0800 Message-ID: <20240214101557.2900512-4-kernel@xen0n.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214101557.2900512-1-kernel@xen0n.name> References: <20240214101557.2900512-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 cc2332b056ba..e973500611b4 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: @@ -330,7 +330,7 @@ static int kvm_check_cpucfg(int id, u64 val) u64 mask; int ret; - ret = _kvm_get_cpucfg(id, &mask); + ret = _kvm_get_cpucfg_mask(id, &mask); if (ret) return ret; @@ -557,7 +557,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