diff options
author | Alexander Graf <agraf@suse.de> | 2013-04-16 06:12:49 -0400 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-04-26 14:27:19 -0400 |
commit | 7df35f549606e8a9004a77ef31dc80dfa893a590 (patch) | |
tree | 6236ee8ebefeeee76c5a860d19042a4e7b45f281 | |
parent | e8cde0939d8ebe9c8ebe5a4bdf71af51a0d56053 (diff) |
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>
Acked-by: Michael S. Tsirkin <mst@redhat.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 2a434bf3918d..f6c3f03623a1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -2522,7 +2522,6 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
2522 | case KVM_CAP_PCI_2_3: | 2522 | case KVM_CAP_PCI_2_3: |
2523 | case KVM_CAP_KVMCLOCK_CTRL: | 2523 | case KVM_CAP_KVMCLOCK_CTRL: |
2524 | case KVM_CAP_READONLY_MEM: | 2524 | case KVM_CAP_READONLY_MEM: |
2525 | case KVM_CAP_IRQFD_RESAMPLE: | ||
2526 | r = 1; | 2525 | r = 1; |
2527 | break; | 2526 | break; |
2528 | case KVM_CAP_COALESCED_MMIO: | 2527 | case KVM_CAP_COALESCED_MMIO: |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index b6f33547b3db..f9492f3847d6 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -2433,6 +2433,9 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) | |||
2433 | #ifdef CONFIG_HAVE_KVM_MSI | 2433 | #ifdef CONFIG_HAVE_KVM_MSI |
2434 | case KVM_CAP_SIGNAL_MSI: | 2434 | case KVM_CAP_SIGNAL_MSI: |
2435 | #endif | 2435 | #endif |
2436 | #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING | ||
2437 | case KVM_CAP_IRQFD_RESAMPLE: | ||
2438 | #endif | ||
2436 | return 1; | 2439 | return 1; |
2437 | #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING | 2440 | #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING |
2438 | case KVM_CAP_IRQ_ROUTING: | 2441 | case KVM_CAP_IRQ_ROUTING: |