From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aairo-0004hG-5v for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aairl-0000NN-G2 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:28 -0500 Received: from e06smtp07.uk.ibm.com ([195.75.94.103]:59703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aairl-0000N2-8I for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:25 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 Mar 2016 11:53:24 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 12091219005F for ; Tue, 1 Mar 2016 11:52:53 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u21Br9YP4391320 for ; Tue, 1 Mar 2016 11:53:09 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u21Ar9oi008146 for ; Tue, 1 Mar 2016 03:53:11 -0700 From: Cornelia Huck Date: Tue, 1 Mar 2016 12:52:53 +0100 Message-Id: <1456833183-27244-5-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1456833183-27244-1-git-send-email-cornelia.huck@de.ibm.com> References: <1456833183-27244-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL 04/14] s390x: remove {kvm_}s390_virtio_irq() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, qemu-devel@nongnu.org, agraf@suse.de This interface was only used by the old virtio machine and therefore is not needed anymore. Reviewed-by: David Hildenbrand Reviewed-by: Halil Pasic Signed-off-by: Cornelia Huck --- 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 6ae5699..49c8415 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -470,10 +470,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); @@ -484,9 +482,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.2