From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode
Date: Mon, 23 May 2011 10:32:56 +0200 [thread overview]
Message-ID: <4DDA1BB8.40409@siemens.com> (raw)
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
next reply other threads:[~2011-05-23 8:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 8:32 Jan Kiszka [this message]
2011-05-24 14:47 ` [PATCH] qemu-kvm: Fix non-ISA IRQ routing in kernel irqchip mode Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DDA1BB8.40409@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox