From: Alexander Graf Date: Fri, 6 Jun 2014 12:46:05 +0000 (+0200) Subject: KVM: Fix GSI number space limit X-Git-Tag: qemu-xen-4.5.0-rc1^2~38 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=552e70d844bfe55e3c73151bf428699dae6df384;p=qemu-upstream-4.5-testing.git KVM: Fix GSI number space limit KVM tells us the number of GSIs it can handle inside the kernel. That value is basically KVM_MAX_IRQ_ROUTES. However when we try to set the GSI mapping table, it checks for r = -EINVAL; if (routing.nr >= KVM_MAX_IRQ_ROUTES) goto out; erroring out even when we're only using all of the GSIs. To make sure we never hit that limit, let's reduce the number of GSIs we get from KVM by one. Cc: qemu-stable@nongnu.org Signed-off-by: Alexander Graf Signed-off-by: Paolo Bonzini (cherry picked from commit 00008418aa22700f6c49e794e79f53aeb157d10f) Signed-off-by: Michael Roth --- diff --git a/kvm-all.c b/kvm-all.c index 82a91199e..cd614965e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -948,7 +948,7 @@ void kvm_init_irq_routing(KVMState *s) { int gsi_count, i; - gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING); + gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING) - 1; if (gsi_count > 0) { unsigned int gsi_bits, i;