Skip to content

Commit

Permalink
target/arm/kvm: Init cap_has_inject_serror_esr in kvm_arch_init
Browse files Browse the repository at this point in the history
There is no need to do this in kvm_arch_init_vcpu per vcpu.
Inline kvm_arm_init_serror_injection rather than keep separate.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
rth7680 authored and pm215 committed Dec 19, 2023
1 parent 09ddc01 commit 51641de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
13 changes: 4 additions & 9 deletions target/arm/kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ static int kvm_arm_vcpu_finalize(CPUState *cs, int feature)
return kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_FINALIZE, &feature);
}

void kvm_arm_init_serror_injection(CPUState *cs)
{
cap_has_inject_serror_esr = kvm_check_extension(cs->kvm_state,
KVM_CAP_ARM_INJECT_SERROR_ESR);
}

bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try,
int *fdarray,
struct kvm_vcpu_init *init)
Expand Down Expand Up @@ -564,6 +558,10 @@ int kvm_arch_init(MachineState *ms, KVMState *s)

cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE);

/* Check whether user space can specify guest syndrome value */
cap_has_inject_serror_esr =
kvm_check_extension(s, KVM_CAP_ARM_INJECT_SERROR_ESR);

if (ms->smp.cpus > 256 &&
!kvm_check_extension(s, KVM_CAP_ARM_IRQ_LINE_LAYOUT_2)) {
error_report("Using more than 256 vcpus requires a host kernel "
Expand Down Expand Up @@ -1946,9 +1944,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
cpu->mp_affinity = mpidr & ARM64_AFFINITY_MASK;

/* Check whether user space can specify guest syndrome value */
kvm_arm_init_serror_injection(cs);

return kvm_arm_init_cpreg_list(cpu);
}

Expand Down
8 changes: 0 additions & 8 deletions target/arm/kvm_arm.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@ void kvm_arm_cpu_post_load(ARMCPU *cpu);
*/
void kvm_arm_reset_vcpu(ARMCPU *cpu);

/**
* kvm_arm_init_serror_injection:
* @cs: CPUState
*
* Check whether KVM can set guest SError syndrome.
*/
void kvm_arm_init_serror_injection(CPUState *cs);

/**
* kvm_get_vcpu_events:
* @cpu: ARMCPU
Expand Down

0 comments on commit 51641de

Please sign in to comment.