diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-29 04:15:33 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-29 04:15:33 -0500 |
| commit | 7e3bba93f42e9d9abe81344bdba5ddc635b7c449 (patch) | |
| tree | 8d1d9ac6cbeb1d5c536b6ff4dc606c5532946949 | |
| parent | b7b275e60bcd5f89771e865a8239325f86d9927d (diff) | |
| parent | 0dd4cdccdab3d74bd86b868768a7dca216bcce7e (diff) | |
| download | v9fs-7e3bba93f42e9d9abe81344bdba5ddc635b7c449.tar.gz | |
Merge tag 'kvm-s390-master-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
VSIE epdx shadowing fix
| -rw-r--r-- | arch/s390/kvm/vsie.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 94138f8f0c1c3f..ace2541ababd38 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_CEI)) scb_s->eca |= scb_o->eca & ECA_CEI; /* Epoch Extension */ - if (test_kvm_facility(vcpu->kvm, 139)) + if (test_kvm_facility(vcpu->kvm, 139)) { scb_s->ecd |= scb_o->ecd & ECD_MEF; + scb_s->epdx = scb_o->epdx; + } /* etoken */ if (test_kvm_facility(vcpu->kvm, 156)) |