[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] s390x: remove {kvm_}s390_virtio_irq()
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 04/10] s390x: remove {kvm_}s390_virtio_irq() |
Date: |
Tue, 23 Feb 2016 12:19:04 +0100 |
This interface was only used by the old virtio machine and therefore
is not needed anymore.
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/cpu.h | 5 -----
target-s390x/interrupt.c | 11 -----------
target-s390x/kvm.c | 11 -----------
3 files changed, 27 deletions(-)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 06ca60b..76cbdca 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -471,10 +471,8 @@ void s390x_tod_timer(void *opaque);
void s390x_cpu_timer(void *opaque);
int s390_virtio_hypercall(CPUS390XState *env);
-void s390_virtio_irq(int config_change, uint64_t token);
#ifdef CONFIG_KVM
-void kvm_s390_virtio_irq(int config_change, uint64_t token);
void kvm_s390_service_interrupt(uint32_t parm);
void kvm_s390_vcpu_interrupt(S390CPU *cpu, struct kvm_s390_irq *irq);
void kvm_s390_floating_interrupt(struct kvm_s390_irq *irq);
@@ -485,9 +483,6 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar,
void *hostbuf,
int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_clock);
int kvm_s390_set_clock(uint8_t *tod_high, uint64_t *tod_clock);
#else
-static inline void kvm_s390_virtio_irq(int config_change, uint64_t token)
-{
-}
static inline void kvm_s390_service_interrupt(uint32_t parm)
{
}
diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c
index 07d210a..bad60a7 100644
--- a/target-s390x/interrupt.c
+++ b/target-s390x/interrupt.c
@@ -28,17 +28,6 @@ void s390_sclp_extint(uint32_t parm)
}
}
-void s390_virtio_irq(int config_change, uint64_t token)
-{
- if (kvm_enabled()) {
- kvm_s390_virtio_irq(config_change, token);
- } else {
- S390CPU *dummy_cpu = s390_cpu_addr2state(0);
-
- cpu_inject_ext(dummy_cpu, EXT_VIRTIO, config_change, token);
- }
-}
-
void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
uint32_t io_int_parm, uint32_t io_int_word)
{
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 6763656..e1859ca 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -936,17 +936,6 @@ void kvm_s390_floating_interrupt(struct kvm_s390_irq *irq)
__kvm_s390_floating_interrupt(irq);
}
-void kvm_s390_virtio_irq(int config_change, uint64_t token)
-{
- struct kvm_s390_irq irq = {
- .type = KVM_S390_INT_VIRTIO,
- .u.ext.ext_params = config_change,
- .u.ext.ext_params2 = token,
- };
-
- kvm_s390_floating_interrupt(&irq);
-}
-
void kvm_s390_service_interrupt(uint32_t parm)
{
struct kvm_s390_irq irq = {
--
2.7.1
- [Qemu-devel] [PATCH 00/10] s390x: pending patches, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 04/10] s390x: remove {kvm_}s390_virtio_irq(),
Cornelia Huck <=
- [Qemu-devel] [PATCH 10/10] s390x/css: Use static initialization for channel_subsys fields, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 06/10] s390x/virtio: old machine leftovers, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 02/10] s390x/kvm: sync fprs via kvm_run, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 01/10] linux-headers: update against kvm/next, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 07/10] s390x/css: introduce indicator refcounting interfaces, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 09/10] s390x/css: Allocate channel_subsys statically, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 03/10] s390x: fix debug statement in trigger_page_fault(), Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 05/10] watchdog/diag288: avoid race condition on expired watchdog, Cornelia Huck, 2016/02/23
- [Qemu-devel] [PATCH 08/10] s390x/pci: fix reg/dereg irq functions, Cornelia Huck, 2016/02/23
- Re: [Qemu-devel] [PATCH 00/10] s390x: pending patches, Cornelia Huck, 2016/02/29