From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab8si-0005mw-Sh for qemu-devel@nongnu.org; Wed, 02 Mar 2016 10:40:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab8sh-0008R9-TK for qemu-devel@nongnu.org; Wed, 02 Mar 2016 10:40:08 -0500 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]:35280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab8sh-0008Qf-II for qemu-devel@nongnu.org; Wed, 02 Mar 2016 10:40:07 -0500 Received: by mail-pa0-x244.google.com with SMTP id fl4so12393939pad.2 for ; Wed, 02 Mar 2016 07:40:07 -0800 (PST) References: <1456913698-11452-1-git-send-email-clg@fr.ibm.com> <1456913698-11452-4-git-send-email-clg@fr.ibm.com> From: Corey Minyard Message-ID: <56D70954.10307@gmail.com> Date: Wed, 2 Mar 2016 09:40:04 -0600 MIME-Version: 1.0 In-Reply-To: <1456913698-11452-4-git-send-email-clg@fr.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 03/10] ipmi: remove IPMI_CHECK_RESERVATION() macro Reply-To: minyard@acm.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Corey Minyard Cc: Marcel Apfelbaum , qemu-devel@nongnu.org, "Michael S. Tsirkin" On 03/02/2016 04:14 AM, Cédric Le Goater wrote: > Some IPMI command handlers in the BMC simulator use a macro > IPMI_CHECK_RESERVATION() to check a SDR reservation but the macro > implicitly uses local variables. This patch simply removes it. > > Signed-off-by: Cédric Le Goater Acked-by: Corey Minyard > --- > hw/ipmi/ipmi_bmc_sim.c | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c > index 32efb87c8232..72166a7da291 100644 > --- a/hw/ipmi/ipmi_bmc_sim.c > +++ b/hw/ipmi/ipmi_bmc_sim.c > @@ -293,16 +293,6 @@ static inline void rsp_buffer_pushmore(struct rsp_buffer *rsp, uint8_t *bytes, > rsp->len += n; > } > > -/* Check that the reservation in the command is valid. */ > -#define IPMI_CHECK_RESERVATION(off, r) \ > - do { \ > - if ((cmd[off] | (cmd[off + 1] << 8)) != r) { \ > - rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; \ > - return; \ > - } \ > - } while (0) > - > - > static void ipmi_sim_handle_timeout(IPMIBmcSim *ibs); > > static void ipmi_gettime(struct ipmi_time *time) > @@ -1210,8 +1200,12 @@ static void get_sdr(IPMIBmcSim *ibs, > struct ipmi_sdr_header *sdrh; > > if (cmd[6]) { > - IPMI_CHECK_RESERVATION(2, ibs->sdr.reservation); > + if ((cmd[2] | (cmd[3] << 8)) != ibs->sdr.reservation) { > + rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; > + return; > + } > } > + > pos = 0; > if (sdr_find_entry(&ibs->sdr, cmd[4] | (cmd[5] << 8), > &pos, &nextrec)) { > @@ -1260,7 +1254,11 @@ static void clear_sdr_rep(IPMIBmcSim *ibs, > uint8_t *cmd, unsigned int cmd_len, > struct rsp_buffer *rsp) > { > - IPMI_CHECK_RESERVATION(2, ibs->sdr.reservation); > + if ((cmd[2] | (cmd[3] << 8)) != ibs->sdr.reservation) { > + rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; > + return; > + } > + > if (cmd[4] != 'C' || cmd[5] != 'L' || cmd[6] != 'R') { > rsp->buffer[2] = IPMI_CC_INVALID_DATA_FIELD; > return; > @@ -1316,7 +1314,10 @@ static void get_sel_entry(IPMIBmcSim *ibs, > unsigned int val; > > if (cmd[6]) { > - IPMI_CHECK_RESERVATION(2, ibs->sel.reservation); > + if ((cmd[2] | (cmd[3] << 8)) != ibs->sel.reservation) { > + rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; > + return; > + } > } > if (ibs->sel.next_free == 0) { > rsp->buffer[2] = IPMI_CC_REQ_ENTRY_NOT_PRESENT; > @@ -1371,7 +1372,11 @@ static void clear_sel(IPMIBmcSim *ibs, > uint8_t *cmd, unsigned int cmd_len, > struct rsp_buffer *rsp) > { > - IPMI_CHECK_RESERVATION(2, ibs->sel.reservation); > + if ((cmd[2] | (cmd[3] << 8)) != ibs->sel.reservation) { > + rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; > + return; > + } > + > if (cmd[4] != 'C' || cmd[5] != 'L' || cmd[6] != 'R') { > rsp->buffer[2] = IPMI_CC_INVALID_DATA_FIELD; > return;