Commit 6cbf1e96 authored by Collin Walling's avatar Collin Walling Committed by Christian Borntraeger
Browse files

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: 23a60f83 ("s390/kvm: diagnose 0x318 sync and reset")
Signed-off-by: default avatarCollin Walling <walling@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Link: https://lore.kernel.org/r/20201104181032.109800-1-walling@linux.ibm.com
parent 1ed576a2

arch/s390/kvm/kvm-s390.c

+0 −2
Original line number Diff line number Diff line
@@ -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)