Message ID | 20160906074710.13495-31-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show |
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index bbf8b2a..d40ef09 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -2481,6 +2481,10 @@ static int configure_cpu_feat(const S390FeatBitmap features) bool kvm_s390_cpu_models_supported(void) { + if (!ri_allowed()) { + /* compatibility machines interfere with the cpu model */ + return false; + } return kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_MODEL, KVM_S390_VM_CPU_MACHINE) && kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_MODEL,