aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2012-08-27 18:33:12 +0400
committermalc <av1474@comtv.ru>2012-08-27 18:33:12 +0400
commit4f213879f3cc695644cfd8bf603495e7316c78f6 (patch)
treee0960d52567c10aaa0e1df2182dc677a70be0efc /hw
parentb3167288367f79754b74ad933146e37938ebff13 (diff)
Revert "i8259: add -no-spurious-interrupt-hack option"
This reverts commit f278d4947fff814dcde2ef2acad36d172ff8be35. Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw')
-rw-r--r--hw/i8259.c18
1 files changed, 0 insertions, 18 deletions
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<<irq);
- s->last_irr &= ~(1<<irq);
- s->isr &= ~(1<<irq);
- return -1;
- }
irq2 = 7;
}
intno = slave_pic->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;
}