Skip to content

Commit

Permalink
target/arm/kvm: Have kvm_arm_sve_set_vls take a ARMCPU argument
Browse files Browse the repository at this point in the history
Unify the "kvm_arm.h" API: All functions related to ARM vCPUs
take a ARMCPU* argument. Use the CPU() QOM cast macro When
calling the generic vCPU API from "sysemu/kvm.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20231123183518.64569-5-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
philmd authored and pm215 committed Dec 19, 2023
1 parent cac675b commit bc1b09b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions target/arm/kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1855,14 +1855,13 @@ uint32_t kvm_arm_sve_get_vls(CPUState *cs)
return vls[0];
}

static int kvm_arm_sve_set_vls(CPUState *cs)
static int kvm_arm_sve_set_vls(ARMCPU *cpu)
{
ARMCPU *cpu = ARM_CPU(cs);
uint64_t vls[KVM_ARM64_SVE_VLS_WORDS] = { cpu->sve_vq.map };

assert(cpu->sve_max_vq <= KVM_ARM64_SVE_VQ_MAX);

return kvm_set_one_reg(cs, KVM_REG_ARM64_SVE_VLS, &vls[0]);
return kvm_set_one_reg(CPU(cpu), KVM_REG_ARM64_SVE_VLS, &vls[0]);
}

#define ARM_CPU_ID_MPIDR 3, 0, 0, 0, 5
Expand Down Expand Up @@ -1919,7 +1918,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
}

if (cpu_isar_feature(aa64_sve, cpu)) {
ret = kvm_arm_sve_set_vls(cs);
ret = kvm_arm_sve_set_vls(cpu);
if (ret) {
return ret;
}
Expand Down

0 comments on commit bc1b09b

Please sign in to comment.