diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-27 14:11:07 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-27 14:11:07 +0200 |
commit | cf9bdd35779e36a5bfc23ec292d6e1c23435878d (patch) | |
tree | 1f55a6cc42dfaf71d8dc1a5a8070ab32e65ecd7c /arch/s390/kvm | |
parent | e891a32e7ae0c6ba57959799c0ac84681616eeef (diff) | |
parent | e000b8e0968dd7bfa09c444607ce1e48e57aafd3 (diff) | |
download | op-kernel-dev-cf9bdd35779e36a5bfc23ec292d6e1c23435878d.zip op-kernel-dev-cf9bdd35779e36a5bfc23ec292d6e1c23435878d.tar.gz |
Merge tag 'kvm-s390-next-4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: MSA8 feature for guests
- Detect all function codes for KMA and export the features
for use in the cpu model
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 8771fef..7eb1275 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -276,6 +276,10 @@ static void kvm_s390_cpu_feat_init(void) __cpacf_query(CPACF_PPNO, (cpacf_mask_t *) kvm_s390_available_subfunc.ppno); + if (test_facility(146)) /* MSA8 */ + __cpacf_query(CPACF_KMA, (cpacf_mask_t *) + kvm_s390_available_subfunc.kma); + if (MACHINE_HAS_ESOP) allow_cpu_feat(KVM_S390_VM_CPU_FEAT_ESOP); /* |