[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] ipmi: Add graceful shutdown handling to the ext
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 6/7] ipmi: Add graceful shutdown handling to the external BMC |
Date: |
Mon, 24 Oct 2016 15:10:20 -0500 |
From: Corey Minyard <address@hidden>
I misunderstood the workings of the power settings, the power off
is a force off operation and there needs to be a separate graceful
shutdown operation. So replace the force off operation with a
graceful shutdown.
Signed-off-by: Corey Minyard <address@hidden>
---
hw/ipmi/ipmi_bmc_extern.c | 11 ++++++++---
tests/ipmi-bt-test.c | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index d30b286..e8e3d25 100644
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -54,7 +54,8 @@
#define VM_CAPABILITIES_IRQ 0x04
#define VM_CAPABILITIES_NMI 0x08
#define VM_CAPABILITIES_ATTN 0x10
-#define VM_CMD_FORCEOFF 0x09
+#define VM_CAPABILITIES_GRACEFUL_SHUTDOWN 0x20
+#define VM_CMD_GRACEFUL_SHUTDOWN 0x09
#define TYPE_IPMI_BMC_EXTERN "ipmi-bmc-extern"
#define IPMI_BMC_EXTERN(obj) OBJECT_CHECK(IPMIBmcExtern, (obj), \
@@ -276,8 +277,8 @@ static void handle_hw_op(IPMIBmcExtern *ibe, unsigned char
hw_op)
k->do_hw_op(s, IPMI_SEND_NMI, 0);
break;
- case VM_CMD_FORCEOFF:
- qemu_system_shutdown_request();
+ case VM_CMD_GRACEFUL_SHUTDOWN:
+ k->do_hw_op(s, IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP, 0);
break;
}
}
@@ -401,6 +402,10 @@ static void chr_event(void *opaque, int event)
if (k->do_hw_op(ibe->parent.intf, IPMI_POWEROFF_CHASSIS, 1) == 0) {
v |= VM_CAPABILITIES_POWER;
}
+ if (k->do_hw_op(ibe->parent.intf, IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP, 1)
+ == 0) {
+ v |= VM_CAPABILITIES_GRACEFUL_SHUTDOWN;
+ }
if (k->do_hw_op(ibe->parent.intf, IPMI_RESET_CHASSIS, 1) == 0) {
v |= VM_CAPABILITIES_RESET;
}
diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
index be9005e..65d05b3 100644
--- a/tests/ipmi-bt-test.c
+++ b/tests/ipmi-bt-test.c
@@ -309,7 +309,7 @@ static void test_connect(void)
uint8_t msg[100];
unsigned int msglen;
static uint8_t exp1[] = { 0xff, 0x01, 0xa1 }; /* A protocol version */
- static uint8_t exp2[] = { 0x08, 0x1f, 0xa1 }; /* A capabilities cmd */
+ static uint8_t exp2[] = { 0x08, 0x3f, 0xa1 }; /* A capabilities cmd */
FD_ZERO(&readfds);
FD_SET(emu_lfd, &readfds);
--
2.7.4
- [Qemu-devel] [PATCH 0/7] ipmi: Various little IPMI fixes, minyard, 2016/10/24
- [Qemu-devel] [PATCH 2/7] ipmi_bmc_sim: Remove an unnecessary mutex, minyard, 2016/10/24
- [Qemu-devel] [PATCH 6/7] ipmi: Add graceful shutdown handling to the external BMC,
minyard <=
- [Qemu-devel] [PATCH 1/7] ipmi: Remove hotplug from IPMI BMCs, minyard, 2016/10/24
- [Qemu-devel] [PATCH 7/7] acpi/ipmi: Initialize the fwinfo before fetching it, minyard, 2016/10/24
- [Qemu-devel] [PATCH 4/7] ipmi: Implement shutdown via ACPI overtemp, minyard, 2016/10/24
- [Qemu-devel] [PATCH 3/7] ipmi: chassis poweroff should use qemu_system_shutdown_request(), minyard, 2016/10/24
- [Qemu-devel] [PATCH 5/7] ipmi: fix build config variable name for ipmi_bmc_extern.o, minyard, 2016/10/24