KVM: s390: clean up return code handling in irq delivery code
Instead of returning a possibly random or'ed together value, let's always return -EFAULT if rc is set. Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
parent
9185124e87
commit
99e20009ae
|
@ -287,7 +287,7 @@ static int __must_check __deliver_cpu_timer(struct kvm_vcpu *vcpu)
|
||||||
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
clear_bit(IRQ_PEND_EXT_CPU_TIMER, &li->pending_irqs);
|
clear_bit(IRQ_PEND_EXT_CPU_TIMER, &li->pending_irqs);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
|
||||||
|
@ -306,7 +306,7 @@ static int __must_check __deliver_ckc(struct kvm_vcpu *vcpu)
|
||||||
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
clear_bit(IRQ_PEND_EXT_CLOCK_COMP, &li->pending_irqs);
|
clear_bit(IRQ_PEND_EXT_CLOCK_COMP, &li->pending_irqs);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_pfault_init(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_pfault_init(struct kvm_vcpu *vcpu)
|
||||||
|
@ -334,7 +334,7 @@ static int __must_check __deliver_pfault_init(struct kvm_vcpu *vcpu)
|
||||||
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= put_guest_lc(vcpu, ext.ext_params2, (u64 *) __LC_EXT_PARAMS2);
|
rc |= put_guest_lc(vcpu, ext.ext_params2, (u64 *) __LC_EXT_PARAMS2);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
|
||||||
|
@ -371,7 +371,7 @@ static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
|
||||||
|
@ -389,7 +389,7 @@ static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
|
||||||
rc |= read_guest_lc(vcpu, offsetof(struct _lowcore, restart_psw),
|
rc |= read_guest_lc(vcpu, offsetof(struct _lowcore, restart_psw),
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
clear_bit(IRQ_PEND_RESTART, &li->pending_irqs);
|
clear_bit(IRQ_PEND_RESTART, &li->pending_irqs);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_stop(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_stop(struct kvm_vcpu *vcpu)
|
||||||
|
@ -450,7 +450,7 @@ static int __must_check __deliver_emergency_signal(struct kvm_vcpu *vcpu)
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)
|
||||||
|
@ -478,7 +478,7 @@ static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW, &vcpu->arch.sie_block->gpsw,
|
rc |= read_guest_lc(vcpu, __LC_EXT_NEW_PSW, &vcpu->arch.sie_block->gpsw,
|
||||||
sizeof(psw_t));
|
sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
|
static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
|
||||||
|
@ -572,7 +572,7 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_PGM_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_PGM_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
|
static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
|
||||||
|
@ -594,7 +594,7 @@ static int __must_check __deliver_service(struct kvm_vcpu *vcpu,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= put_guest_lc(vcpu, inti->ext.ext_params,
|
rc |= put_guest_lc(vcpu, inti->ext.ext_params,
|
||||||
(u32 *)__LC_EXT_PARAMS);
|
(u32 *)__LC_EXT_PARAMS);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu,
|
static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu,
|
||||||
|
@ -614,7 +614,7 @@ static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
|
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
|
||||||
(u64 *)__LC_EXT_PARAMS2);
|
(u64 *)__LC_EXT_PARAMS2);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_virtio(struct kvm_vcpu *vcpu,
|
static int __must_check __deliver_virtio(struct kvm_vcpu *vcpu,
|
||||||
|
@ -639,7 +639,7 @@ static int __must_check __deliver_virtio(struct kvm_vcpu *vcpu,
|
||||||
(u32 *)__LC_EXT_PARAMS);
|
(u32 *)__LC_EXT_PARAMS);
|
||||||
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
|
rc |= put_guest_lc(vcpu, inti->ext.ext_params2,
|
||||||
(u64 *)__LC_EXT_PARAMS2);
|
(u64 *)__LC_EXT_PARAMS2);
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_io(struct kvm_vcpu *vcpu,
|
static int __must_check __deliver_io(struct kvm_vcpu *vcpu,
|
||||||
|
@ -667,7 +667,7 @@ static int __must_check __deliver_io(struct kvm_vcpu *vcpu,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_IO_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_IO_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __must_check __deliver_mchk_floating(struct kvm_vcpu *vcpu,
|
static int __must_check __deliver_mchk_floating(struct kvm_vcpu *vcpu,
|
||||||
|
@ -692,7 +692,7 @@ static int __must_check __deliver_mchk_floating(struct kvm_vcpu *vcpu,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
|
rc |= read_guest_lc(vcpu, __LC_MCK_NEW_PSW,
|
||||||
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
|
||||||
return rc;
|
return rc ? -EFAULT : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef int (*deliver_irq_t)(struct kvm_vcpu *vcpu);
|
typedef int (*deliver_irq_t)(struct kvm_vcpu *vcpu);
|
||||||
|
|
Loading…
Reference in New Issue