public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode
@ 2011-05-23  8:32 Jan Kiszka
  2011-05-24 14:47 ` Avi Kivity
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2011-05-23  8:32 UTC (permalink / raw)
  To: Avi Kivity, Marcelo Tosatti; +Cc: kvm

Merge regression of d1dcf63406: The KVM i8259 believes it is also an
IOAPIC and takes all GSIs. Until we refactor this, work around it by
avoiding the isa_irq_handler dispatcher in kernel irqchip mode.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/pc_piix.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 66c5e04..7af03fa 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -131,7 +131,11 @@ static void pc_init1(ram_addr_t ram_size,
     if (pci_enabled) {
         ioapic_init(isa_irq_state);
     }
-    isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
+    if (!(kvm_enabled() && kvm_irqchip_in_kernel())) {
+        isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
+    } else {
+        isa_irq = i8259;
+    }
 
     if (pci_enabled) {
         if (!xen_enabled()) {
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-24 14:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-23  8:32 [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode Jan Kiszka
2011-05-24 14:47 ` Avi Kivity

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox