From patchwork Fri Mar 11 15:10:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 8566701 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A8799F38C for ; Fri, 11 Mar 2016 15:36:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 621E420272 for ; Fri, 11 Mar 2016 15:36:38 +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 A103D2026F for ; Fri, 11 Mar 2016 15:36:37 +0000 (UTC) Received: from localhost ([::1]:55846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeP7F-0007js-1G for patchwork-qemu-devel@patchwork.kernel.org; Fri, 11 Mar 2016 10:36:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOhr-0003i7-Bx for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:10:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeOhl-0000Z0-H4 for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:10:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOhl-0000Yu-A9 for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:10:17 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 967533BECF; Fri, 11 Mar 2016 15:10:16 +0000 (UTC) Received: from redhat.com (vpn1-4-242.ams2.redhat.com [10.36.4.242]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2BFACSv028737; Fri, 11 Mar 2016 10:10:13 -0500 Date: Fri, 11 Mar 2016 17:10:12 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1457708548-14093-46-git-send-email-mst@redhat.com> References: <1457708548-14093-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1457708548-14093-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Eduardo Habkost , Corey Minyard , =?us-ascii?B?PT9VVEYtOD9xP0M9QzM9QTlkcmljPTIwTGU9MjBHb2F0ZXI/PQ==?= , Marcel Apfelbaum , Greg Kurz Subject: [Qemu-devel] [PULL 45/53] 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 From: Cédric Le Goater 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 1b615f6..3089bfe 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -292,16 +292,6 @@ static inline void rsp_buffer_pushmore(RspBuffer *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) @@ -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 *ibs, 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 *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; @@ -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;