aboutsummaryrefslogtreecommitdiff
path: root/hw/intc/apic.c
diff options
context:
space:
mode:
authorSergio Lopez <slp@redhat.com>2019-09-26 14:48:00 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2019-10-22 09:39:54 +0200
commit78cafff81088492fe70e12b3bded219096031f7c (patch)
tree3bedc0aff263d40979d4cdf6f27476bf791041b7 /hw/intc/apic.c
parente5f6aa319f7636168469b2c797249680fa5e0413 (diff)
downloadqemu-78cafff81088492fe70e12b3bded219096031f7c.zip
qemu-78cafff81088492fe70e12b3bded219096031f7c.tar.gz
qemu-78cafff81088492fe70e12b3bded219096031f7c.tar.bz2
hw/intc/apic: reject pic ints if isa_pic == NULL
In apic_accept_pic_intr(), reject PIC interruptions if a i8259 PIC has not been instantiated (isa_pic == NULL). Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sergio Lopez <slp@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/intc/apic.c')
-rw-r--r--hw/intc/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index bce8991..2a74f7b 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -610,7 +610,7 @@ int apic_accept_pic_intr(DeviceState *dev)
if ((s->apicbase & MSR_IA32_APICBASE_ENABLE) == 0 ||
(lvt0 & APIC_LVT_MASKED) == 0)
- return 1;
+ return isa_pic != NULL;
return 0;
}