From 4f213879f3cc695644cfd8bf603495e7316c78f6 Mon Sep 17 00:00:00 2001 From: malc Date: Mon, 27 Aug 2012 18:33:12 +0400 Subject: Revert "i8259: add -no-spurious-interrupt-hack option" This reverts commit f278d4947fff814dcde2ef2acad36d172ff8be35. Signed-off-by: malc --- hw/i8259.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'hw/i8259.c') diff --git a/hw/i8259.c b/hw/i8259.c index 7ecb7e1de6..65876662a1 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -26,7 +26,6 @@ #include "isa.h" #include "monitor.h" #include "qemu-timer.h" -#include "sysemu.h" #include "i8259_internal.h" /* debug PIC */ @@ -194,20 +193,6 @@ int pic_read_irq(DeviceState *d) pic_intack(slave_pic, irq2); } else { /* spurious IRQ on slave controller */ - if (no_spurious_interrupt_hack) { - /* Pretend it was delivered and acknowledged. If - * it was spurious due to slave_pic->imr, then - * as soon as the mask is cleared, the slave will - * re-trigger IRQ2 on the master. If it is spurious for - * some other reason, make sure we don't keep trying - * to half-process the same spurious interrupt over - * and over again. - */ - s->irr &= ~(1<last_irr &= ~(1<isr &= ~(1<irq_base + irq2; @@ -217,9 +202,6 @@ int pic_read_irq(DeviceState *d) pic_intack(s, irq); } else { /* spurious IRQ on host controller */ - if (no_spurious_interrupt_hack) { - return -1; - } irq = 7; intno = s->irq_base + irq; } -- cgit v1.2.3