diff options
| author | Collin Walling <walling@linux.ibm.com> | 2020-11-04 13:10:32 -0500 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2020-11-11 09:31:52 +0100 |
| commit | 6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc (patch) | |
| tree | dfe7a73e7f8a8c1dba7f938d9276bfe1093a18cb | |
| parent | 1ed576a20cd5c93295f57d6b7400357bd8d01b21 (diff) | |
| download | linux-stable-6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc.tar.gz linux-stable-6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc.tar.bz2 linux-stable-6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc.zip | |
KVM: s390: remove diag318 reset code
The diag318 data must be set to 0 by VM-wide reset events
triggered by diag308. As such, KVM should not handle
resetting this data via the VCPU ioctls.
Fixes: 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
Signed-off-by: Collin Walling <walling@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Link: https://lore.kernel.org/r/20201104181032.109800-1-walling@linux.ibm.com
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 08ea6c4735cd..425d3d75320b 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -3564,7 +3564,6 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->pp = 0; vcpu->arch.sie_block->fpf &= ~FPF_BPBC; vcpu->arch.sie_block->todpr = 0; - vcpu->arch.sie_block->cpnc = 0; } } @@ -3582,7 +3581,6 @@ static void kvm_arch_vcpu_ioctl_clear_reset(struct kvm_vcpu *vcpu) regs->etoken = 0; regs->etoken_extension = 0; - regs->diag318 = 0; } int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) |