f94667336e
Despite cautioning that S390CPU is needed for upcoming CPUState
refactorings, commit 5d69c547d9 (s390:
I/O interrupt and machine check injection.) added functions
cpu_inject_io() and cpu_inject_crw_mchk() with CPUS390XState argument,
claiming consistency with cpu_inject_ext().
This complicates making cpu_interrupt() take a CPUState even more and it
required to pass &cpu->env from some S390CPU-aware call sites already,
creating inconsistency elsewhere. Address that.
This also eliminates the need for CPUS390XState in s390_virtio_irq().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
31 lines
796 B
C
31 lines
796 B
C
/*
|
|
* QEMU S/390 Interrupt support
|
|
*
|
|
* Copyright IBM, Corp. 2012
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at your
|
|
* option) any later version. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "cpu.h"
|
|
#include "sysemu/kvm.h"
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
/* service interrupts are floating therefore we must not pass an cpustate */
|
|
void s390_sclp_extint(uint32_t parm)
|
|
{
|
|
S390CPU *dummy_cpu = s390_cpu_addr2state(0);
|
|
CPUS390XState *env = &dummy_cpu->env;
|
|
|
|
if (kvm_enabled()) {
|
|
#ifdef CONFIG_KVM
|
|
kvm_s390_interrupt_internal(dummy_cpu, KVM_S390_INT_SERVICE, parm,
|
|
0, 1);
|
|
#endif
|
|
} else {
|
|
env->psw.addr += 4;
|
|
cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0);
|
|
}
|
|
}
|
|
#endif
|