david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 1465267577-1808-2-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Shannon Zhao 2016-06-14 15:59:12 +01:00 committed by Peter Maydell
parent 7474f1be70
commit 5c0a3819f0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-arm/cpu.h
View File

@ -572,6 +572,8 @@ struct ARMCPU {
bool powered_off; bool powered_off;
/* CPU has security extension */ /* CPU has security extension */
bool has_el3; bool has_el3;
/* CPU has PMU (Performance Monitor Unit) */
bool has_pmu;
/* CPU has memory protection unit */ /* CPU has memory protection unit */
bool has_mpu; bool has_mpu;

5
target-arm/kvm64.c
View File

@ -461,6 +461,11 @@ int kvm_arch_init_vcpu(CPUState *cs)
if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT; 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 */ /* Do KVM_ARM_VCPU_INIT ioctl */
ret = kvm_arm_vcpu_init(cs); ret = kvm_arm_vcpu_init(cs);