diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-05 11:54:46 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2015-03-11 01:18:59 +0100 |
| commit | dc9be0fac70a2ad86e31a81372bb0bdfb6945353 (patch) | |
| tree | d515c5004b6f58412e3dac08729afa614aca0b9b /virt | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-dc9be0fac70a2ad86e31a81372bb0bdfb6945353.tar.xz linux-dc9be0fac70a2ad86e31a81372bb0bdfb6945353.zip | |
kvm: move advertising of KVM_CAP_IRQFD to common code
POWER supports irqfds but forgot to advertise them. Some userspace does
not check for the capability, but others check it---thus they work on
x86 and s390 but not POWER.
To avoid that other architectures in the future make the same mistake, let
common code handle KVM_CAP_IRQFD the same way as KVM_CAP_IRQFD_RESAMPLE.
Reported-and-tested-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Fixes: 297e21053a52f060944e9f0de4c64fad9bcd72fc
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a1093700f3a4..a2214d9609bd 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2492,6 +2492,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) case KVM_CAP_SIGNAL_MSI: #endif #ifdef CONFIG_HAVE_KVM_IRQFD + case KVM_CAP_IRQFD: case KVM_CAP_IRQFD_RESAMPLE: #endif case KVM_CAP_CHECK_EXTENSION_VM: |