mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipmi: Fix watchdog NMI handling

Browse Source 
The wrong logic was used for detection (so it wouldn't work at all)
and the wrong interface was used to inject the NMI if the detection
logic was correct.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Corey Minyard 2019-08-16 09:09:21 -05:00
parent a77d20bafc
commit 6af94767da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ipmi/ipmi.c
View File

@ -28,9 +28,8 @@
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/visitor.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/nmi.h"
static uint32_t ipmi_current_uuid = 1; static uint32_t ipmi_current_uuid = 1;
@ -60,7 +59,8 @@ static int ipmi_do_hw_op(IPMIInterface *s, enum ipmi_op op, int checkonly)
if (checkonly) { if (checkonly) {
return 0; return 0;
} }
qmp_inject_nmi(NULL); /* We don't care what CPU we use. */
nmi_monitor_handle(0, NULL);
return 0; return 0;
case IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP: case IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP:

2
hw/ipmi/ipmi_bmc_sim.c
View File

@ -1194,7 +1194,7 @@ static void set_watchdog_timer(IPMIBmcSim *ibs,
break; break;
case IPMI_BMC_WATCHDOG_PRE_NMI: case IPMI_BMC_WATCHDOG_PRE_NMI:
if (!k->do_hw_op(s, IPMI_SEND_NMI, 1)) { if (k->do_hw_op(s, IPMI_SEND_NMI, 1)) {
/* NMI not supported. */ /* NMI not supported. */
rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD);
return; return;