Commit 743db27c authored Nov 11, 2013 by Heiko Carstens Committed by Cornelia Huck Nov 28, 2013

KVM: s390: fix diagnose code extraction



The diagnose code to be used is the contents of the base register (if not
zero), plus the displacement. The current code ignores the base register
contents. So let's fix that...

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

parent 178bd789

arch/s390/kvm/diag.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu)

		int kvm_s390_handle_diag(struct kvm_vcpu *vcpu)
		{
		int code = (vcpu->arch.sie_block->ipb & 0xfff0000) >> 16;
		int code = kvm_s390_get_base_disp_rs(vcpu) & 0xffff;

		if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);