[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/38] s390x/kvm: don't enable key wrapping if msa3 i
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 32/38] s390x/kvm: don't enable key wrapping if msa3 is disabled |
Date: |
Tue, 6 Sep 2016 09:47:04 +0200 |
From: David Hildenbrand <address@hidden>
As the CPU model now controls msa3, trying to set wrapping keys without
msa3 being around/enable in the kernel will produce misleading errors.
So let's simply not configure key wrapping if msa3 is not enabled and
make compat machines with disabled CPU model work correctly.
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/cpu_models.c | 3 +++
target-s390x/kvm.c | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
index 2cb5fd2..32431cb 100644
--- a/target-s390x/cpu_models.c
+++ b/target-s390x/cpu_models.c
@@ -155,6 +155,9 @@ bool s390_has_feat(S390Feat feat)
if (feat == S390_FEAT_RUNTIME_INSTRUMENTATION) {
return kvm_s390_get_ri();
}
+ if (feat == S390_FEAT_MSA_EXT_3) {
+ return true;
+ }
}
#endif
return 0;
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 82a07ae..dfaf1ca 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -260,8 +260,10 @@ static void kvm_s390_init_dea_kw(void)
void kvm_s390_crypto_reset(void)
{
- kvm_s390_init_aes_kw();
- kvm_s390_init_dea_kw();
+ if (s390_has_feat(S390_FEAT_MSA_EXT_3)) {
+ kvm_s390_init_aes_kw();
+ kvm_s390_init_dea_kw();
+ }
}
int kvm_arch_init(MachineState *ms, KVMState *s)
--
2.9.3
- [Qemu-devel] [PULL 13/38] s390x/cpumodel: introduce CPU features, (continued)
- [Qemu-devel] [PULL 13/38] s390x/cpumodel: introduce CPU features, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 04/38] s390/sclp: cache the sclp device, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 15/38] s390x/cpumodel: generate CPU feature group lists, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 10/38] qmp: details about CPU definitions in query-cpu-definitions, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 03/38] s390x/pci: assert zpci always existing, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 17/38] s390x/cpumodel: register defined CPU models as subclasses, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 27/38] s390x/sclp: propagate hmfai, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 21/38] s390x/cpumodel: check and apply the CPU model, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 29/38] s390x/kvm: implement CPU model support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 28/38] s390x/kvm: allow runtime-instrumentation for "none" machine, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 32/38] s390x/kvm: don't enable key wrapping if msa3 is disabled,
Cornelia Huck <=
- [Qemu-devel] [PULL 23/38] s390x/sclp: introduce sclp feature blocks, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 36/38] s390x/cpumodel: implement QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 37/38] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 30/38] s390x/kvm: disable host model for problematic compat machines, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 33/38] qmp: add QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 34/38] qmp: add QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 16/38] s390x/cpumodel: introduce CPU feature group definitions, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 31/38] s390x/kvm: let the CPU model control CMM(A), Cornelia Huck, 2016/09/06