From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGsdY-0004Bb-FR for qemu-devel@nongnu.org; Wed, 06 Jan 2016 13:16:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGsdT-0006Pm-DV for qemu-devel@nongnu.org; Wed, 06 Jan 2016 13:16:44 -0500 Received: from e06smtp09.uk.ibm.com ([195.75.94.105]:33791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGsdT-0006Pf-4n for qemu-devel@nongnu.org; Wed, 06 Jan 2016 13:16:39 -0500 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Jan 2016 18:16:36 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7661A17D8056 for ; Wed, 6 Jan 2016 18:17:20 +0000 (GMT) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u06IGZxc10092866 for ; Wed, 6 Jan 2016 18:16:35 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u06IGYuK009945 for ; Wed, 6 Jan 2016 11:16:34 -0700 References: <1452015002-28493-3-git-send-email-clg@fr.ibm.com> <20160106105539.4bee4e9f@bahia.local> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <568D59FB.9040303@fr.ibm.com> Date: Wed, 6 Jan 2016 19:16:27 +0100 MIME-Version: 1.0 In-Reply-To: <20160106105539.4bee4e9f@bahia.local> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 2/8] ipmi: add get and set SENSOR_TYPE commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: Corey Minyard , qemu-devel@nongnu.org, "Michael S. Tsirkin" On 01/06/2016 10:55 AM, Greg Kurz wrote: > On Tue, 5 Jan 2016 18:29:56 +0100 > Cédric Le Goater wrote: > >> Signed-off-by: Cédric Le Goater >> --- > > Acked-by: Greg Kurz > > Just some minor comments on the form below. > > >> hw/ipmi/ipmi_bmc_sim.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 49 insertions(+), 2 deletions(-) >> >> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c >> index 559e1398d669..061db8437479 100644 >> --- a/hw/ipmi/ipmi_bmc_sim.c >> +++ b/hw/ipmi/ipmi_bmc_sim.c >> @@ -37,13 +37,15 @@ >> #define IPMI_CMD_CHASSIS_CONTROL 0x02 >> >> #define IPMI_NETFN_SENSOR_EVENT 0x04 >> -#define IPMI_NETFN_SENSOR_EVENT_MAXCMD 0x2e >> +#define IPMI_NETFN_SENSOR_EVENT_MAXCMD 0x30 >> > > Maybe IPMI_NETFN_SENSOR_EVENT_MAXCMD should be defined... These are maximums for each IPMI family of commands (netfn). See the arrays at the end of the file : static const IPMICmdHandler *_cmds[*_MAXCMD] You'll get the idea. >> #define IPMI_CMD_SET_SENSOR_EVT_ENABLE 0x28 >> #define IPMI_CMD_GET_SENSOR_EVT_ENABLE 0x29 >> #define IPMI_CMD_REARM_SENSOR_EVTS 0x2a >> #define IPMI_CMD_GET_SENSOR_EVT_STATUS 0x2b >> #define IPMI_CMD_GET_SENSOR_READING 0x2d >> +#define IPMI_CMD_SET_SENSOR_TYPE 0x2e >> +#define IPMI_CMD_GET_SENSOR_TYPE 0x2f >> > > ... here ? > >> /* #define IPMI_NETFN_APP 0x06 In ipmi.h */ >> #define IPMI_NETFN_APP_MAXCMD 0x36 >> @@ -1576,6 +1578,49 @@ static void get_sensor_reading(IPMIBmcSim *ibs, >> return; >> } >> >> +static void set_sensor_type(IPMIBmcSim *ibs, >> + uint8_t *cmd, unsigned int cmd_len, >> + uint8_t *rsp, unsigned int *rsp_len, >> + unsigned int max_rsp_len) >> +{ >> + IPMISensor *sens; >> + >> + >> + IPMI_CHECK_CMD_LEN(5); >> + if ((cmd[2] > MAX_SENSORS) || > > Parenthesis not needed here since > has precedence over || > >> + !IPMI_SENSOR_GET_PRESENT(ibs->sensors + cmd[2])) { > > Indentation ? OK. I will fix that. >> + rsp[2] = IPMI_CC_REQ_ENTRY_NOT_PRESENT; >> + goto out; >> + } >> + sens = ibs->sensors + cmd[2]; >> + sens->sensor_type = cmd[3]; >> + sens->evt_reading_type_code = cmd[4] & 0x7f; > > So evt_reading_type_code is 7bit ? Maybe worth to > introduce a IPMI_SENSOR_TYPE_MASK define. Yes. there are a few of these in the code. >> + >> + out: >> + return; >> +} >> + >> +static void get_sensor_type(IPMIBmcSim *ibs, >> + uint8_t *cmd, unsigned int cmd_len, >> + uint8_t *rsp, unsigned int *rsp_len, >> + unsigned int max_rsp_len) >> +{ >> + IPMISensor *sens; >> + >> + >> + IPMI_CHECK_CMD_LEN(3); >> + if ((cmd[2] > MAX_SENSORS) || >> + !IPMI_SENSOR_GET_PRESENT(ibs->sensors + cmd[2])) { > > Parenthesis and indentation ? yep. copy & paste :) Thanks, C. >> + rsp[2] = IPMI_CC_REQ_ENTRY_NOT_PRESENT; >> + goto out; >> + } >> + sens = ibs->sensors + cmd[2]; >> + IPMI_ADD_RSP_DATA(sens->sensor_type); >> + IPMI_ADD_RSP_DATA(sens->evt_reading_type_code); >> + out: >> + return; >> +} >> + >> static const IPMICmdHandler chassis_cmds[IPMI_NETFN_CHASSIS_MAXCMD] = { >> [IPMI_CMD_GET_CHASSIS_CAPABILITIES] = chassis_capabilities, >> [IPMI_CMD_GET_CHASSIS_STATUS] = chassis_status, >> @@ -1592,7 +1637,9 @@ sensor_event_cmds[IPMI_NETFN_SENSOR_EVENT_MAXCMD] = { >> [IPMI_CMD_GET_SENSOR_EVT_ENABLE] = get_sensor_evt_enable, >> [IPMI_CMD_REARM_SENSOR_EVTS] = rearm_sensor_evts, >> [IPMI_CMD_GET_SENSOR_EVT_STATUS] = get_sensor_evt_status, >> - [IPMI_CMD_GET_SENSOR_READING] = get_sensor_reading >> + [IPMI_CMD_GET_SENSOR_READING] = get_sensor_reading, >> + [IPMI_CMD_SET_SENSOR_TYPE] = set_sensor_type, >> + [IPMI_CMD_GET_SENSOR_TYPE] = get_sensor_type, >> }; >> static const IPMINetfn sensor_event_netfn = { >> .cmd_nums = IPMI_NETFN_SENSOR_EVENT_MAXCMD, >