summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2019-08-16 16:59:07 -0500
committerCorey Minyard <cminyard@mvista.com>2019-09-20 14:08:10 -0500
commit8bc8af69123ee765fe4f9b835a99f6ef5d693973 (patch)
treed20add0da92ca1fa8e55545eda8b40d01562311b
parentfb45770bf55ef1d50369c433b19d908260d5a986 (diff)
downloadfocaccia-qemu-8bc8af69123ee765fe4f9b835a99f6ef5d693973.tar.gz
focaccia-qemu-8bc8af69123ee765fe4f9b835a99f6ef5d693973.zip
ipmi: Generate an interrupt on watchdog pretimeout expiry
Add the watchdog pretimeout to the bits that cause an interrupt on attn.
Otherwise the user won't know.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r--hw/ipmi/ipmi_bmc_sim.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index afb99e33d7..6e6cd1b47d 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -477,7 +477,9 @@ static int attn_set(IPMIBmcSim *ibs)
 
 static int attn_irq_enabled(IPMIBmcSim *ibs)
 {
-    return (IPMI_BMC_MSG_INTS_ON(ibs) && IPMI_BMC_MSG_FLAG_RCV_MSG_QUEUE_SET(ibs))
+    return (IPMI_BMC_MSG_INTS_ON(ibs) &&
+            (IPMI_BMC_MSG_FLAG_RCV_MSG_QUEUE_SET(ibs) ||
+             IPMI_BMC_MSG_FLAG_WATCHDOG_TIMEOUT_MASK_SET(ibs)))
         || (IPMI_BMC_EVBUF_FULL_INT_ENABLED(ibs) &&
             IPMI_BMC_MSG_FLAG_EVT_BUF_FULL_SET(ibs));
 }