[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/15] ipmi: Fix watchdog NMI handling
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 01/15] ipmi: Fix watchdog NMI handling |
Date: |
Mon, 19 Aug 2019 15:16:51 -0500 |
From: Corey Minyard <address@hidden>
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 <address@hidden>
---
hw/ipmi/ipmi.c | 6 +++---
hw/ipmi/ipmi_bmc_sim.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index 136c86b7a7..cbe158f815 100644
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -28,9 +28,8 @@
#include "qom/object_interfaces.h"
#include "sysemu/runstate.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
-#include "qapi/visitor.h"
#include "qemu/module.h"
+#include "hw/nmi.h"
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) {
return 0;
}
- qmp_inject_nmi(NULL);
+ /* We don't care what CPU we use. */
+ nmi_monitor_handle(0, NULL);
return 0;
case IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP:
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 246a6d390c..8f63bb7181 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -1194,7 +1194,7 @@ static void set_watchdog_timer(IPMIBmcSim *ibs,
break;
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. */
rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD);
return;
--
2.17.1
- [Qemu-devel] [PATCH 00/15] IPMI updates for 4.3, minyard, 2019/08/19
- [Qemu-devel] [PATCH 04/15] tests:ipmi: Fix IPMI BT tests, minyard, 2019/08/19
- [Qemu-devel] [PATCH 06/15] ipmi: Add a UUID device property, minyard, 2019/08/19
- [Qemu-devel] [PATCH 03/15] ipmi: Generate an interrupt on watchdog pretimeout expiry, minyard, 2019/08/19
- [Qemu-devel] [PATCH 10/15] smbios:ipmi: Ignore IPMI devices with no fwinfo function, minyard, 2019/08/19
- [Qemu-devel] [PATCH 02/15] ipmi: Fix the get watchdog command, minyard, 2019/08/19
- [Qemu-devel] [PATCH 01/15] ipmi: Fix watchdog NMI handling,
minyard <=
- [Qemu-devel] [PATCH 13/15] acpi: Add i2c serial bus CRS handling, minyard, 2019/08/19
- [Qemu-devel] [PATCH 05/15] qdev: Add a no default uuid property, minyard, 2019/08/19
- [Qemu-devel] [PATCH 07/15] ipmi: Split out KCS-specific code from ISA KCS code, minyard, 2019/08/19
- [Qemu-devel] [PATCH 11/15] ipmi: Add PCI IPMI interfaces, minyard, 2019/08/19
- [Qemu-devel] [PATCH 09/15] ipmi: Allow a size value to be passed for I/O space, minyard, 2019/08/19
- [Qemu-devel] [PATCH 15/15] pc: Add an SMB0 ACPI device to q35, minyard, 2019/08/19
- [Qemu-devel] [PATCH 14/15] ipmi: Fix SSIF ACPI handling to use the right CRS, minyard, 2019/08/19
- [Qemu-devel] [PATCH 08/15] ipmi: Split out BT-specific code from ISA BT code, minyard, 2019/08/19