repository: /home/avi/kvm branch: master commit 6b83c95fa77ec81e53f528cd239846f3440b4845 Author: Avi Kivity <[EMAIL PROTECTED]> Date: Mon Sep 24 16:36:58 2007 +0200
kvm: qemu: if apic won't accept the pic interrupt, don't raise it without this, "interrupt -1" keeps being raised and killing the guest if it has been set to mask pic interrupts through the apic. Signed-off-by: Avi Kivity <[EMAIL PROTECTED]> diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index 7c6ceb1..73a49aa 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -111,7 +111,7 @@ int cpu_get_pic_interrupt(CPUState *env) static void pic_irq_request(void *opaque, int level) { CPUState *env = opaque; - if (level) + if (level && apic_accept_pic_intr(env)) cpu_interrupt(env, CPU_INTERRUPT_HARD); else cpu_reset_interrupt(env, CPU_INTERRUPT_HARD); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-commits mailing list kvm-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-commits