diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2012-07-23 21:37:05 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-08-15 17:47:09 +0200 |
| commit | 000a1a3800b532f97b939ebb777d5a14418f44a6 (patch) | |
| tree | 9528aa20777ba7063d581d6e39d407fdd615e951 /target-s390x/op_helper.c | |
| parent | 9abf567d95a4e840df868ca993219175fbef8c22 (diff) | |
s390: provide interface for service interrupt/introduce interrupt.c
This patch creates interrupt.c. The first user is a callback for hw/*
code to trigger an service interrupt for a given sccb value. Several
interrupt types for s390 are floating (can be delivered to all CPUs).
so this code does not belong to a specific CPU.
Other interrupts (like the virtio one) are also floating and can be
moved here later on.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/op_helper.c')
| -rw-r--r-- | target-s390x/op_helper.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index 91dd8dc3fb..abc35ddd7b 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -2362,12 +2362,6 @@ static void program_interrupt(CPUS390XState *env, uint32_t code, int ilc) } } -static void ext_interrupt(CPUS390XState *env, int type, uint32_t param, - uint64_t param64) -{ - cpu_inject_ext(env, type, param, param64); -} - /* * ret < 0 indicates program check, ret = 0,1,2,3 -> cc */ @@ -2398,15 +2392,7 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code) stb_phys(sccb + SCP_INCREMENT, 1 << shift); stw_phys(sccb + SCP_RESPONSE_CODE, 0x10); - if (kvm_enabled()) { -#ifdef CONFIG_KVM - kvm_s390_interrupt_internal(env, KVM_S390_INT_SERVICE, - sccb & ~3, 0, 1); -#endif - } else { - env->psw.addr += 4; - ext_interrupt(env, EXT_SERVICE, sccb & ~3, 0); - } + s390_sclp_extint(sccb & ~3); break; default: #ifdef DEBUG_HELPER |