From patchwork Thu Mar 10 14:03:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 8557301 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7249EC0553 for ; Thu, 10 Mar 2016 14:08:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6E762034F for ; Thu, 10 Mar 2016 14:08:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5E842021A for ; Thu, 10 Mar 2016 14:08:00 +0000 (UTC) Received: from localhost ([::1]:48744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae1Fw-0006ZT-5O for patchwork-qemu-devel@patchwork.kernel.org; Thu, 10 Mar 2016 09:08:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae1CR-0000zl-Oh for qemu-devel@nongnu.org; Thu, 10 Mar 2016 09:04:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae1CN-0003Vn-MZ for qemu-devel@nongnu.org; Thu, 10 Mar 2016 09:04:23 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:56799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae1CN-0003VX-Cw for qemu-devel@nongnu.org; Thu, 10 Mar 2016 09:04:19 -0500 Received: from localhost by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 10 Mar 2016 14:04:16 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 10 Mar 2016 14:04:15 -0000 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: clg@fr.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3697217D8042 for ; Thu, 10 Mar 2016 14:04:43 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2AE4Er11704420 for ; Thu, 10 Mar 2016 14:04:14 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2AE4Dm2005435 for ; Thu, 10 Mar 2016 09:04:14 -0500 Received: from hermes.lab.toulouse-stg.fr.ibm.com (hermes.lab.toulouse-stg.fr.ibm.com [9.101.4.42]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u2AE4C4a005293; Thu, 10 Mar 2016 09:04:13 -0500 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Corey Minyard Date: Thu, 10 Mar 2016 15:03:56 +0100 Message-Id: <1457618643-32310-4-git-send-email-clg@fr.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1457618643-32310-1-git-send-email-clg@fr.ibm.com> References: <1457618643-32310-1-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16031014-0005-0000-0000-00000ABE2B5E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.113 Cc: Marcel Apfelbaum , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v3 03/10] ipmi: remove IPMI_CHECK_RESERVATION() macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) Index: qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c =================================================================== --- qemu-powernv.git.orig/hw/ipmi/ipmi_bmc_sim.c +++ qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c @@ -292,16 +292,6 @@ static inline void rsp_buffer_pushmore(R 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) @@ -1226,8 +1216,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)) { @@ -1276,7 +1270,11 @@ static void clear_sdr_rep(IPMIBmcSim *ib uint8_t *cmd, unsigned int cmd_len, RspBuffer *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; @@ -1332,7 +1330,10 @@ static void get_sel_entry(IPMIBmcSim *ib 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; @@ -1387,7 +1388,11 @@ static void clear_sel(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len, RspBuffer *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;