Commit 5c0a3819 authored by Shannon Zhao's avatar Shannon Zhao Committed by Peter Maydell
Browse files

target-arm: kvm64: set guest PMUv3 feature bit if supported 



Check if kvm supports guest PMUv3. If so, set the corresponding feature
bit for vcpu.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Message-id: 1465267577-1808-2-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 7474f1be

target-arm/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -572,6 +572,8 @@ struct ARMCPU { 
    bool powered_off;

    /* CPU has security extension */

    bool has_el3;

    /* CPU has PMU (Performance Monitor Unit) */

    bool has_pmu;



    /* CPU has memory protection unit */

    bool has_mpu;

target-arm/kvm64.c

+5 −0
Original line number Diff line number Diff line
@@ -461,6 +461,11 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {

        cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT;

    }

    if (kvm_irqchip_in_kernel() &&

        kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PMU_V3)) {

        cpu->has_pmu = true;

        cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PMU_V3;

    }



    /* Do KVM_ARM_VCPU_INIT ioctl */

    ret = kvm_arm_vcpu_init(cs);