diff options
| author | Christoffer Dall <c.dall@virtualopensystems.com> | 2012-07-24 08:51:20 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-26 12:23:25 +0300 |
| commit | 23d43cf998275bc97437931c0cdee1df2c1aa3ca (patch) | |
| tree | cc1a76fefb98f66e7807d54049ddaf008db055ac /virt/kvm | |
| parent | 99245b507dc3b1b2815d6a6cb4e94a6b7018a24b (diff) | |
| download | linux-23d43cf998275bc97437931c0cdee1df2c1aa3ca.tar.gz linux-23d43cf998275bc97437931c0cdee1df2c1aa3ca.tar.bz2 linux-23d43cf998275bc97437931c0cdee1df2c1aa3ca.zip | |
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>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/kvm_main.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index de89497fe4c7..bcf973ec98ff 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2149,6 +2149,29 @@ static long kvm_vm_ioctl(struct file *filp, break; } #endif +#ifdef __KVM_HAVE_IRQ_LINE + 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 = kvm_vm_ioctl_irq_line(kvm, &irq_event); + if (r) + goto out; + + r = -EFAULT; + if (ioctl == KVM_IRQ_LINE_STATUS) { + if (copy_to_user(argp, &irq_event, sizeof irq_event)) + goto out; + } + + r = 0; + break; + } +#endif default: r = kvm_arch_vm_ioctl(filp, ioctl, arg); if (r == -ENOTTY) |