38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 07bd62920f968da7d1d8962cc7fd3d29652d25f4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ying Fang <fangying1@huawei.com>
|
||
|
|
Date: Tue, 21 Apr 2020 17:04:13 +0800
|
||
|
|
Subject: [PATCH 2/4] target/arm/kvm64: kvm64 cpus have timer registers
|
||
|
|
|
||
|
|
Add the missing GENERIC_TIMER feature to kvm64 cpus.
|
||
|
|
|
||
|
|
We don't currently use these registers when KVM is enabled, but it's
|
||
|
|
probably best we add the feature flag for consistency and potential
|
||
|
|
future use. There's also precedent, as we add the PMU feature flag to
|
||
|
|
KVM enabled guests, even though we don't use those registers either.
|
||
|
|
|
||
|
|
This change was originally posted as a hunk of a different, never
|
||
|
|
merged patch from Bijan Mottahedeh.
|
||
|
|
|
||
|
|
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Message-id: 20200120101023.16030-4-drjones@redhat.com
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
---
|
||
|
|
target/arm/kvm64.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
|
||
|
|
index 22d19c9a..f2f0a92e 100644
|
||
|
|
--- a/target/arm/kvm64.c
|
||
|
|
+++ b/target/arm/kvm64.c
|
||
|
|
@@ -587,6 +587,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
|
||
|
|
set_feature(&features, ARM_FEATURE_NEON);
|
||
|
|
set_feature(&features, ARM_FEATURE_AARCH64);
|
||
|
|
set_feature(&features, ARM_FEATURE_PMU);
|
||
|
|
+ set_feature(&features, ARM_FEATURE_GENERIC_TIMER);
|
||
|
|
|
||
|
|
ahcf->features = features;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.23.0
|