From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab3ol-0008UA-38 for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab3oh-0005vI-MU for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:42 -0500 Received: from e06smtp07.uk.ibm.com ([195.75.94.103]:46202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab3og-0005v9-PC for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:39 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 Mar 2016 10:15:37 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1F64C1B0804B for ; Wed, 2 Mar 2016 10:15:34 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u22AFB6Y61603972 for ; Wed, 2 Mar 2016 10:15:11 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u229FCc8009663 for ; Wed, 2 Mar 2016 02:15:13 -0700 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Wed, 2 Mar 2016 11:14:51 +0100 Message-Id: <1456913698-11452-4-git-send-email-clg@fr.ibm.com> In-Reply-To: <1456913698-11452-1-git-send-email-clg@fr.ibm.com> References: <1456913698-11452-1-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 03/10] ipmi: remove IPMI_CHECK_RESERVATION() macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corey Minyard Cc: Marcel Apfelbaum , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, "Michael S. Tsirkin" 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 --- 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; -- 2.1.4