Commit aeb87c3c authored Jun 12, 2013 by Thomas Huth Committed by Paolo Bonzini Jun 17, 2013

KVM: s390: Fix epsw instruction decoding



The handle_epsw() function calculated the first register in the wrong way,
so that it always used r0 by mistake. Now the code uses the common helper
function for decoding the registers of rre functions instead to avoid such
mistakes.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent b764bb1c

arch/s390/kvm/priv.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -457,8 +457,7 @@ static int handle_epsw(struct kvm_vcpu *vcpu)
		{
		int reg1, reg2;

		reg1 = (vcpu->arch.sie_block->ipb & 0x00f00000) >> 24;
		reg2 = (vcpu->arch.sie_block->ipb & 0x000f0000) >> 16;
		kvm_s390_get_regs_rre(vcpu, &reg1, &reg2);

		/* This basically extracts the mask half of the psw. */
		vcpu->run->s.regs.gprs[reg1] &= 0xffffffff00000000;

Admin message