diff options
author | Andreas Färber <afaerber@suse.de> | 2013-01-30 12:48:24 +0000 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-02-01 02:02:20 +0100 |
commit | f94667336ecf6566e090a895a37bc06da435d686 (patch) | |
tree | a79088f7bd0e6fc08dfcec334ae3dc4172c4b2bd /target-s390x/interrupt.c | |
parent | 07cc7d128111958e1079632129b1633cb2a435ec (diff) |
target-s390x: Clean up cpu_inject_*() signatures
Despite cautioning that S390CPU is needed for upcoming CPUState
refactorings, commit 5d69c547d947798cba92d836d06f6e017ba2b19d (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>
Diffstat (limited to 'target-s390x/interrupt.c')
-rw-r--r-- | target-s390x/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c index e51519dbd7..6d6580de3a 100644 --- a/target-s390x/interrupt.c +++ b/target-s390x/interrupt.c @@ -24,7 +24,7 @@ void s390_sclp_extint(uint32_t parm) #endif } else { env->psw.addr += 4; - cpu_inject_ext(env, EXT_SERVICE, parm, 0); + cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0); } } #endif |