summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-12-02 09:43:29 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2016-03-08 13:57:54 +0100
commit80bc79dc0b18b17510ceb1e2d2d1999104af03c9 (patch)
treeafba43230090250af51edc4cf4b0b29ea34f74dc /arch/s390
parentb3c17f10fa2cfc29cf35e4821275e046e725213e (diff)
downloadtalos-obmc-linux-80bc79dc0b18b17510ceb1e2d2d1999104af03c9.tar.gz
talos-obmc-linux-80bc79dc0b18b17510ceb1e2d2d1999104af03c9.zip
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 <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/kvm-s390.c3
1 files changed, 2 insertions, 1 deletions
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)
OpenPOWER on IntegriCloud