From: David Hildenbrand Date: Wed, 2 Dec 2015 08:43:29 +0000 (+0100) Subject: KVM: s390: enable STFLE interpretation only if enabled for the guest X-Git-Tag: v4.6-rc1~141^2^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80bc79dc0b18b17510ceb1e2d2d1999104af03c9;p=karo-tx-linux.git KVM: s390: enable STFLE interpretation only if enabled for the guest Not setting the facility list designation disables STFLE interpretation, this is what we want if the guest was told to not have it. Signed-off-by: David Hildenbrand Signed-off-by: Christian Borntraeger --- diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index b54daed49c2c..b6a065403bdc 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1639,7 +1639,8 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu) vcpu->arch.cpu_id = model->cpu_id; vcpu->arch.sie_block->ibc = model->ibc; - vcpu->arch.sie_block->fac = (int) (long) model->fac->list; + if (test_kvm_facility(vcpu->kvm, 7)) + vcpu->arch.sie_block->fac = (int) (long) model->fac->list; } int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)