[PATCH] qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing

Bernhard Kohl
2010-09-14T14:10:27Z

The setting of the irq0override flag must be also passed properly
to the KVM_IRQCHIP_IOAPIC.

Signed-off-by: Bernhard Kohl <bernhard.kohl@nsn.com>
---
qemu-kvm-x86.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index fd974b3..e35c234 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -1388,9 +1388,9 @@ int kvm_arch_init_irq_routing(void)
}
}
for (i = 0; i < 24; ++i) {
- if (i == 0) {
+ if (i == 0 && irq0override) {
r = kvm_add_irq_route(kvm_context, i, KVM_IRQCHIP_IOAPIC, 2);
- } else if (i != 2) {
+ } else if (i != 2 || !irq0override) {
r = kvm_add_irq_route(kvm_context, i, KVM_IRQCHIP_IOAPIC, i);
}
if (r < 0) {
--
1.7.2.2