Commit 34821036 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/kvm: disable host model for problematic compat machines 



Compatibility machines that touch runtime-instrumentation should not
be used with the CPU model. Otherwise the host model will look different,
depending on the QEMU machine QEMU has been started with.

So let's simply disable the host model for existing compatibility machines
that all disable ri. This, in return, disables the CPU model for these
compat machines completely.

Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-23-dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 3b84c25c

target-s390x/kvm.c

+4 −0
Original line number Diff line number Diff line
@@ -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,