| Message ID | 20240222105109.2042732-3-kernel@xen0n.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: LoongArch: Fix wrong CPUCFG ID handling | expand |
On 2024/2/22 下午6:51, WANG Xuerui wrote: > From: WANG Xuerui <git@xen0n.name> > > 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 <git@xen0n.name> > --- > 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 7fd32de6656b..9f63bbaf19c1 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) > { > if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) > return -EINVAL; > @@ -339,7 +339,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; > > @@ -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; > > Reviewed-by: Bibo Mao <maobibo@loongson.cn>
diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 7fd32de6656b..9f63bbaf19c1 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) { if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) return -EINVAL; @@ -339,7 +339,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; @@ -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;