From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS8Is-0002yy-8Q for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aS8Ir-0002g1-7G for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS8Iq-0002fx-W1 for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:53 -0500 Date: Sat, 6 Feb 2016 21:13:48 +0200 From: "Michael S. Tsirkin" Message-ID: <1454784308-21177-26-git-send-email-mst@redhat.com> References: <1454784308-21177-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1454784308-21177-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 25/45] ipmi: add ACPI power and GUID commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?us-ascii?B?PT9VVEYtOD9xP0M9QzM9QTlkcmljPTIwTGU9MjBHb2F0ZXI/PQ==?= , Eduardo Habkost , Greg Kurz , Corey Minyard From: C=E9dric Le Goater >>From the specs (20.8 Get Device GUID Command), the command needs to return a GUID (Globally Unique ID), or UUID, that should never change over the lifetime of the device. qemu_uuid looked like a good candidate to start with but we could use a specific BMC property also if needed. Signed-off-by: C=E9dric Le Goater Acked-by: Corey Minyard Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/ipmi/ipmi_bmc_sim.c | 49 ++++++++++++++++++++++++++++++++++++++++++++= +++++ 1 file changed, 49 insertions(+) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 29224dd..e1ad19b 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "sysemu/sysemu.h" #include "qemu/timer.h" #include "hw/ipmi/ipmi.h" #include "qemu/error-report.h" @@ -49,6 +50,9 @@ #define IPMI_CMD_GET_DEVICE_ID 0x01 #define IPMI_CMD_COLD_RESET 0x02 #define IPMI_CMD_WARM_RESET 0x03 +#define IPMI_CMD_SET_ACPI_POWER_STATE 0x06 +#define IPMI_CMD_GET_ACPI_POWER_STATE 0x07 +#define IPMI_CMD_GET_DEVICE_GUID 0x08 #define IPMI_CMD_RESET_WATCHDOG_TIMER 0x22 #define IPMI_CMD_SET_WATCHDOG_TIMER 0x24 #define IPMI_CMD_GET_WATCHDOG_TIMER 0x25 @@ -198,6 +202,9 @@ struct IPMIBmcSim { =20 uint8_t restart_cause; =20 + uint8_t acpi_power_state[2]; + uint8_t uuid[16]; + IPMISel sel; IPMISdr sdr; IPMISensor sensors[MAX_SENSORS]; @@ -826,6 +833,36 @@ static void warm_reset(IPMIBmcSim *ibs, k->reset(s, false); } } +static void set_acpi_power_state(IPMIBmcSim *ibs, + uint8_t *cmd, unsigned int cmd_len, + uint8_t *rsp, unsigned int *rsp_len, + unsigned int max_rsp_len) +{ + IPMI_CHECK_CMD_LEN(4); + ibs->acpi_power_state[0] =3D cmd[2]; + ibs->acpi_power_state[1] =3D cmd[3]; +} + +static void get_acpi_power_state(IPMIBmcSim *ibs, + uint8_t *cmd, unsigned int cmd_len, + uint8_t *rsp, unsigned int *rsp_len, + unsigned int max_rsp_len) +{ + IPMI_ADD_RSP_DATA(ibs->acpi_power_state[0]); + IPMI_ADD_RSP_DATA(ibs->acpi_power_state[1]); +} + +static void get_device_guid(IPMIBmcSim *ibs, + uint8_t *cmd, unsigned int cmd_len, + uint8_t *rsp, unsigned int *rsp_len, + unsigned int max_rsp_len) +{ + unsigned int i; + + for (i =3D 0; i < 16; i++) { + IPMI_ADD_RSP_DATA(ibs->uuid[i]); + } +} =20 static void set_bmc_global_enables(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len, @@ -1608,6 +1645,9 @@ static const IPMICmdHandler app_cmds[] =3D { [IPMI_CMD_GET_DEVICE_ID] =3D get_device_id, [IPMI_CMD_COLD_RESET] =3D cold_reset, [IPMI_CMD_WARM_RESET] =3D warm_reset, + [IPMI_CMD_SET_ACPI_POWER_STATE] =3D set_acpi_power_state, + [IPMI_CMD_GET_ACPI_POWER_STATE] =3D get_acpi_power_state, + [IPMI_CMD_GET_DEVICE_GUID] =3D get_device_guid, [IPMI_CMD_SET_BMC_GLOBAL_ENABLES] =3D set_bmc_global_enables, [IPMI_CMD_GET_BMC_GLOBAL_ENABLES] =3D get_bmc_global_enables, [IPMI_CMD_CLR_MSG_FLAGS] =3D clr_msg_flags, @@ -1733,6 +1773,15 @@ static void ipmi_sim_init(Object *obj) i +=3D len; } =20 + ibs->acpi_power_state[0] =3D 0; + ibs->acpi_power_state[1] =3D 0; + + if (qemu_uuid_set) { + memcpy(&ibs->uuid, qemu_uuid, 16); + } else { + memset(&ibs->uuid, 0, 16); + } + ipmi_init_sensors_from_sdrs(ibs); register_cmds(ibs); =20 --=20 MST