Commit caedd892 authored by WANG Xuerui's avatar WANG Xuerui Committed by Xianglai Li
Browse files

LoongArch: KVM: Rename _kvm_get_cpucfg() to _kvm_get_cpucfg_mask() 

mainline inclusion
from mainline-v6.8-rc5
commit ec83f39d2b078d6dd029bbde601835b5368fc886
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I94LRF


CVE: NA

--------------------------------

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.

Reviewed-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarWANG Xuerui <git@xen0n.name>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarXianglai Li <lixianglai@loongson.cn>
parent 04cfbc03

arch/loongarch/kvm/vcpu.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

	if (id < 0 || id >= KVM_MAX_CPUCFG_REGS)

		return -EINVAL;
@@ -339,7 +339,7 @@ static int kvm_check_cpucfg(int id, u64 val) 
	int ret;

	u64 mask = 0;



	ret = _kvm_get_cpucfg(id, &mask);

	ret = _kvm_get_cpucfg_mask(id, &mask);

	if (ret)

		return ret;
@@ -567,7 +567,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;