[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] De-assert ISA PIC IRQs properly
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 1/2] De-assert ISA PIC IRQs properly |
Date: |
Wed, 20 Aug 2008 17:16:05 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
[ Taking latest isapc changes into account. ]
In case the PIC IRQ gets de-asserted on an isapc machine, we also have
to reset CPU_INTERRUPT_HARD. This is what older qemu (before the
routing-through-APIC changes) used to do as well.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/pc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Index: b/hw/pc.c
===================================================================
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -118,17 +118,19 @@ static void pic_irq_request(void *opaque
{
CPUState *env = first_cpu;
- if (!level)
- return;
-
if (env->apic_state) {
+ if (!level)
+ return;
while (env) {
if (apic_accept_pic_intr(env))
apic_local_deliver(env, APIC_LINT0);
env = env->next_cpu;
}
} else {
- cpu_interrupt(env, CPU_INTERRUPT_HARD);
+ if (level)
+ cpu_interrupt(env, CPU_INTERRUPT_HARD);
+ else
+ cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
}
}