diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-03-11 13:52:06 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-06-10 09:50:27 +0200 |
| commit | 79afc36d91be7550affbe7db227b4552451da41d (patch) | |
| tree | f2334185225606c090b0fe73a16e52c926681a27 /target-s390x/cpu.h | |
| parent | bcb2b582f35a34b5aee6bdafd93f3eabd9fca6ff (diff) | |
s390x: consolidate floating interrupts
Move the injection code for all floating interrupts to interrupt.c
and add a comment.
Also get rid of the #ifdef CONFIG_KVM for the service interrupt.
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x/cpu.h')
| -rw-r--r-- | target-s390x/cpu.h | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 808b906861..5940f22c26 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -357,6 +357,7 @@ void s390x_tod_timer(void *opaque); void s390x_cpu_timer(void *opaque); int s390_virtio_hypercall(CPUS390XState *env); +void s390_virtio_irq(S390CPU *cpu, int config_change, uint64_t token); #ifdef CONFIG_KVM void kvm_s390_reset_vcpu(S390CPU *cpu); @@ -364,6 +365,7 @@ void kvm_s390_interrupt(S390CPU *cpu, int type, uint32_t code); void kvm_s390_virtio_irq(S390CPU *cpu, int config_change, uint64_t token); void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm, uint64_t parm64, int vm); +void kvm_s390_service_interrupt(S390CPU *cpu, uint32_t parm); #else static inline void kvm_s390_reset_vcpu(S390CPU *cpu) { @@ -383,6 +385,9 @@ static inline void kvm_s390_interrupt_internal(S390CPU *cpu, int type, int vm) { } +static inline void kvm_s390_service_interrupt(S390CPU *cpu, uint32_t parm) +{ +} #endif S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); void s390_add_running_cpu(S390CPU *cpu); @@ -1120,29 +1125,10 @@ static inline int s390_cpu_restart(S390CPU *cpu) return -ENOSYS; } -static inline void s390_io_interrupt(S390CPU *cpu, - uint16_t subchannel_id, - uint16_t subchannel_nr, - uint32_t io_int_parm, - uint32_t io_int_word) -{ - if (kvm_enabled()) { - kvm_s390_io_interrupt(cpu, subchannel_id, subchannel_nr, io_int_parm, - io_int_word); - } else { - cpu_inject_io(cpu, subchannel_id, subchannel_nr, io_int_parm, - io_int_word); - } -} - -static inline void s390_crw_mchk(S390CPU *cpu) -{ - if (kvm_enabled()) { - kvm_s390_crw_mchk(cpu); - } else { - cpu_inject_crw_mchk(cpu); - } -} +void s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, + uint16_t subchannel_nr, uint32_t io_int_parm, + uint32_t io_int_word); +void s390_crw_mchk(S390CPU *cpu); static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id, int vq, |