summaryrefslogtreecommitdiffstats
path: root/target-s390x
diff options
context:
space:
mode:
authorEric Auger <eric.auger@linaro.org>2014-10-31 13:38:18 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2014-12-15 12:21:01 +0100
commitf41389ae3c54bd5e2040e3f95a2872981c3ed965 (patch)
tree212d9e2c0a1d7e130a526b66ad10b6edc585284a /target-s390x
parent9551ea6991cfb7c777f7943ad69b30d0a4fadac3 (diff)
downloadhqemu-f41389ae3c54bd5e2040e3f95a2872981c3ed965.zip
hqemu-f41389ae3c54bd5e2040e3f95a2872981c3ed965.tar.gz
KVM_CAP_IRQFD and KVM_CAP_IRQFD_RESAMPLE checks
Compute kvm_irqfds_allowed by checking the KVM_CAP_IRQFD extension. Remove direct settings in architecture specific files. Add a new kvm_resamplefds_allowed variable, initialized by checking the KVM_CAP_IRQFD_RESAMPLE extension. Add a corresponding kvm_resamplefds_enabled() function. A special notice for s390 where KVM_CAP_IRQFD was not immediatly advirtised when irqfd capability was introduced in the kernel. KVM_CAP_IRQ_ROUTING was advertised instead. This was fixed in "KVM: s390: announce irqfd capability", ebc3226202d5956a5963185222982d435378b899 whereas irqfd support was brought in 84223598778ba08041f4297fda485df83414d57e, "KVM: s390: irq routing for adapter interrupts". Both commits first appear in 3.15 so there should not be any kernel version impacted by this QEMU modification. Signed-off-by: Eric Auger <eric.auger@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-s390x')
-rw-r--r--target-s390x/kvm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 50709ba..1b79c4d 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1294,7 +1294,6 @@ void kvm_arch_init_irq_routing(KVMState *s)
* have to override the common code kvm_halt_in_kernel_allowed setting.
*/
if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
- kvm_irqfds_allowed = true;
kvm_gsi_routing_allowed = true;
kvm_halt_in_kernel_allowed = false;
}
OpenPOWER on IntegriCloud