KVM: Move KVM_IRQ_LINE to arch-generic code

Handle KVM_IRQ_LINE and KVM_IRQ_LINE_STATUS in the generic
kvm_vm_ioctl() function and call into kvm_vm_ioctl_irq_line().

This is even more relevant when KVM/ARM also uses this ioctl.

Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 10 insertions, 23 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index bd77cb507c1c..eac65380bd20 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -924,6 +924,16 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         return 0;
 }
 
+int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event)
+{
+        if (!irqchip_in_kernel(kvm))
+                return -ENXIO;
+
+        irq_event->status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
+                                        irq_event->irq, irq_event->level);
+        return 0;
+}
+
 long kvm_arch_vm_ioctl(struct file *filp,
                 unsigned int ioctl, unsigned long arg)
 {
@@ -963,29 +973,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 }
                 break;
-        case KVM_IRQ_LINE_STATUS:
-        case KVM_IRQ_LINE: {
-                struct kvm_irq_level irq_event;
-
-                r = -EFAULT;
-                if (copy_from_user(&irq_event, argp, sizeof irq_event))
-                        goto out;
-                r = -ENXIO;
-                if (irqchip_in_kernel(kvm)) {
-                        __s32 status;
-                        status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
-                                    irq_event.irq, irq_event.level);
-                        if (ioctl == KVM_IRQ_LINE_STATUS) {
-                                r = -EFAULT;
-                                irq_event.status = status;
-                                if (copy_to_user(argp, &irq_event,
-                                                        sizeof irq_event))
-                                        goto out;
-                        }
-                        r = 0;
-                }
-                break;
-                }
         case KVM_GET_IRQCHIP: {
                 /* 0: PIC master, 1: PIC slave, 2: IOAPIC */
                 struct kvm_irqchip chip;