Commit 07b03035 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: sigp: inject emergency calls in a separate function 



In preparation for further code changes, this patch moves the injection of
emergency calls into a separate function and uses it for the processing of
SIGP EMERGENCY CALL and SIGP CONDITIONAL EMERGENCY CALL.

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 42cb0c9f

arch/s390/kvm/sigp.c

+9 −3
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ static int __sigp_sense(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu, 
	return rc;

}



static int __sigp_emergency(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu)

static int __inject_sigp_emergency(struct kvm_vcpu *vcpu,

				    struct kvm_vcpu *dst_vcpu)

{

	struct kvm_s390_interrupt s390int = {

		.type = KVM_S390_INT_EMERGENCY,
@@ -62,6 +63,11 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu) 
	return rc ? rc : SIGP_CC_ORDER_CODE_ACCEPTED;

}



static int __sigp_emergency(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu)

{

	return __inject_sigp_emergency(vcpu, dst_vcpu);

}



static int __sigp_conditional_emergency(struct kvm_vcpu *vcpu,

					struct kvm_vcpu *dst_vcpu,

					u16 asn, u64 *reg)
@@ -76,12 +82,12 @@ static int __sigp_conditional_emergency(struct kvm_vcpu *vcpu, 
	p_asn = dst_vcpu->arch.sie_block->gcr[4] & 0xffff;  /* Primary ASN */

	s_asn = dst_vcpu->arch.sie_block->gcr[3] & 0xffff;  /* Secondary ASN */



	/* Deliver the emergency signal? */

	/* Inject the emergency signal? */

	if (!(flags & CPUSTAT_STOPPED)

	    || (psw->mask & psw_int_mask) != psw_int_mask

	    || ((flags & CPUSTAT_WAIT) && psw->addr != 0)

	    || (!(flags & CPUSTAT_WAIT) && (asn == p_asn || asn == s_asn))) {

		return __sigp_emergency(vcpu, dst_vcpu);

		return __inject_sigp_emergency(vcpu, dst_vcpu);

	} else {

		*reg &= 0xffffffff00000000UL;

		*reg |= SIGP_STATUS_INCORRECT_STATE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE