diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-28 22:36:42 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 8417f904bad50021b432dfea12613345d9fb1f68 (patch) | |
| tree | 955b565a71a6bb5376b386cb99eedf8fe69fbf6f /target/s390x/cpu.c | |
| parent | 14ca122e753c7bc925e6cedc4f16588bc154090d (diff) | |
| download | qemu-8417f904bad50021b432dfea12613345d9fb1f68.tar.gz | |
s390x/tcg: rework checking for deliverable interrupts
Currently, enabling/disabling of interrupts is not really supported.
Let's improve interrupt handling code by explicitly checking for
deliverable interrupts only. This is the first step. Checking for
external interrupt subclasses will be done next.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-5-david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/cpu.c')
| -rw-r--r-- | target/s390x/cpu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 77d55c9e1e..b0517475fa 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -56,10 +56,12 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu = S390_CPU(cs); - CPUS390XState *env = &cpu->env; - return (cs->interrupt_request & CPU_INTERRUPT_HARD) && - (env->psw.mask & PSW_MASK_EXT); + if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { + return false; + } + + return s390_cpu_has_int(cpu); } #if !defined(CONFIG_USER_ONLY) |