summaryrefslogtreecommitdiff
path: root/target-s390x
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2016-09-07 12:50:40 +0200
committerCornelia Huck <cornelia.huck@de.ibm.com>2016-09-19 11:05:51 +0200
commite73316d594256cedb926cb76444e8ee00a5032b9 (patch)
tree3f09d12f4632e628a343205d19cd1a3264e4f6a8 /target-s390x
parente3571ae30cd26d19efd4554c25e32ef64d6a36b3 (diff)
downloadqemu-e73316d594256cedb926cb76444e8ee00a5032b9.tar.gz
s390x/kvm: disable cpu model for the 2.7 machine
cpu model was merged with 2.8, it is wrong to abuse ri_allowed which was enabled with 2.7. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x')
-rw-r--r--target-s390x/kvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index dfaf1ca8d1..4b847a3be4 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -2490,7 +2490,7 @@ static int configure_cpu_feat(const S390FeatBitmap features)
bool kvm_s390_cpu_models_supported(void)
{
- if (!ri_allowed()) {
+ if (!cpu_model_allowed()) {
/* compatibility machines interfere with the cpu model */
return false;
}