diff options
| author | Alexander Graf <agraf@suse.de> | 2013-04-16 10:12:49 (GMT) |
|---|---|---|
| committer | Stuart Yoder <stuart.yoder@freescale.com> | 2013-04-19 22:43:59 (GMT) |
| commit | e5557be2f787cff8f4daab4b39d38b5822f41390 (patch) | |
| tree | 9427e3a32254b017a6f4f6b0ab99997f21473f90 | |
| parent | 4486cf9a7a4d823c43b54e1b6280f41bcc59022d (diff) | |
| download | linux-fsl-qoriq-e5557be2f787cff8f4daab4b39d38b5822f41390.tar.xz | |
KVM: Move irqfd resample cap handling to generic code
Now that we have most irqfd code completely platform agnostic, let's move
irqfd's resample capability return to generic code as well.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 1 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f384710..4f0c678 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2504,7 +2504,6 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_PCI_2_3: case KVM_CAP_KVMCLOCK_CTRL: case KVM_CAP_READONLY_MEM: - case KVM_CAP_IRQFD_RESAMPLE: r = 1; break; case KVM_CAP_COALESCED_MMIO: diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6b1dce2b..bc9152d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2514,6 +2514,9 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) #ifdef CONFIG_HAVE_KVM_MSI case KVM_CAP_SIGNAL_MSI: #endif +#ifdef CONFIG_HAVE_KVM_IRQ_ROUTING + case KVM_CAP_IRQFD_RESAMPLE: +#endif return 1; #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING case KVM_CAP_IRQ_ROUTING: |