summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2014-11-21 22:21:50 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-23 18:33:36 +0100
commitc274e03af70544506cd7214fcc2d4c4376c2c6f4 (patch)
tree1ff3241fbca679739572922c0a040e71aab9e25f /arch/x86/kvm/x86.c
parent6b397158d07f885154b871a15f879d25b3de7579 (diff)
downloadtalos-op-linux-c274e03af70544506cd7214fcc2d4c4376c2c6f4.tar.gz
talos-op-linux-c274e03af70544506cd7214fcc2d4c4376c2c6f4.zip
kvm: x86: move assigned-dev.c and iommu.c to arch/x86/
Now that ia64 is gone, we can hide deprecated device assignment in x86. Notable changes: - kvm_vm_ioctl_assigned_device() was moved to x86/kvm_arch_vm_ioctl() The easy parts were removed from generic kvm code, remaining - kvm_iommu_(un)map_pages() would require new code to be moved - struct kvm_assigned_dev_kernel depends on struct kvm_irq_ack_notifier Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5337039427c8..782e4eaf4561 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4007,7 +4007,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
}
default:
- ;
+ r = kvm_vm_ioctl_assigned_device(kvm, ioctl, arg);
}
out:
return r;
OpenPOWER on IntegriCloud