From: Sergio Lopez <slp@redhat.com>
Date: Thu, 26 Sep 2019 12:48:00 +0000 (+0200)
Subject: hw/intc/apic: reject pic ints if isa_pic == NULL
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78cafff81088492fe70e12b3bded219096031f7c;p=qmiga%2Fqemu.git

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>
---

diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index bce89911dc..2a74f7b4bf 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;
 }