diff options
Diffstat (limited to 'hw/ipmi')
| -rw-r--r-- | hw/ipmi/ipmi.c | 2 | ||||
| -rw-r--r-- | hw/ipmi/ipmi_bmc_sim.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index dfab272f9e..6adec1e990 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -51,9 +51,7 @@ static int ipmi_do_hw_op(IPMIInterface *s, enum ipmi_op op, int checkonly) if (checkonly) { return 0; } - qemu_mutex_lock_iothread(); qmp_inject_nmi(NULL); - qemu_mutex_unlock_iothread(); return 0; case IPMI_POWERCYCLE_CHASSIS: diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index e1ad19b8db..f8b21761a2 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -559,7 +559,7 @@ static void ipmi_init_sensors_from_sdrs(IPMIBmcSim *s) static int ipmi_register_netfn(IPMIBmcSim *s, unsigned int netfn, const IPMINetfn *netfnd) { - if ((netfn & 1) || (netfn > MAX_NETFNS) || (s->netfns[netfn / 2])) { + if ((netfn & 1) || (netfn >= MAX_NETFNS) || (s->netfns[netfn / 2])) { return -1; } s->netfns[netfn / 2] = netfnd; @@ -1135,6 +1135,8 @@ static void set_watchdog_timer(IPMIBmcSim *ibs, rsp[2] = IPMI_CC_INVALID_DATA_FIELD; return; } + break; + default: /* We don't support PRE_SMI */ rsp[2] = IPMI_CC_INVALID_DATA_FIELD; |