From patchwork Tue Jan 16 00:57:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 124575 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp845223lje; Mon, 15 Jan 2018 17:04:28 -0800 (PST) X-Google-Smtp-Source: ACJfBovFKTtBT5pDSiZQi6XlKa7uabHs6Yokp4ulYBD5vuKgt4Xjgxfc+mow1mzHxvM5vAMCj75q X-Received: by 10.37.132.142 with SMTP id v14mr4200942ybk.25.1516064668116; Mon, 15 Jan 2018 17:04:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516064668; cv=none; d=google.com; s=arc-20160816; b=qtNOT7gfypJy5yF8TJMqQzUZy9p8UVan277uOXMV20ljEzLUUgZ9e1DfBkSkz39GIu z+C8bMfp58xfiQ5DQYQ+mLD2sA1YusvnLMDXjJLWUXL55bEVUy5OgTeIDKMmlwjjv2Is kpntu22kxHy1eDYh97jcfZH7w2K9p50nKV4HdL1Jg6+iVwTea73I8SLULmmJmFxc5iqr ysRNo20gYsdxq2g0criVYfJ9uFJUPmaOC2NzwVSyKOmOi+bW6L5nn+8fI4c8uwLjsB7K SCvBOrWtvljyEp+llXxnkwtzGqQw9Du+qSctdsYXZi/37Mg1zaziUYyB/aCbRILGijOe FOYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=ndywooamgOd517vOhAA7GNJlYZHYIDNlD+AUJ7gj3MXHhtDdJxoAMdP8FWkOzA2KIy 5NfQZHbPuLBiCKNwFA8NeVW/EUkiBX+ggUJlgELkze5n4JOLjtN9H1TN1yVhXVFv3ygG kSFbPar+A+EXGW9/BIxXZlPZEaHFrswDM1xz01QRCi8tKe/OUn/HMdfMGc48rJVkyhGH URBILKV7MbuJV8X787krRoDaoWFnsyBtmx8bKNkZ01x9GpU5MQP7pw5+MfkNqGBaN9S1 6UdM3v2Mx0RDb9XvPRvNTMUhuKK3SMvqjaJ0ChNTge9e+wcq5Ao60Knf4sZlgMLcupYb 1vlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=iIcsJREU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b85si214919ybg.376.2018.01.15.17.04.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 15 Jan 2018 17:04:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=iIcsJREU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:49784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebFfv-0003Pb-Kl for patch@linaro.org; Mon, 15 Jan 2018 20:04:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebFZu-0007s9-AE for qemu-devel@nongnu.org; Mon, 15 Jan 2018 19:58:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebFZs-0000lS-Bq for qemu-devel@nongnu.org; Mon, 15 Jan 2018 19:58:14 -0500 Received: from mail-ot0-x242.google.com ([2607:f8b0:4003:c0f::242]:36511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebFZs-0000kr-7V for qemu-devel@nongnu.org; Mon, 15 Jan 2018 19:58:12 -0500 Received: by mail-ot0-x242.google.com with SMTP id w4so12197116otg.3 for ; Mon, 15 Jan 2018 16:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=iIcsJREUNoTr2AKdMItSMM3N+G8vYWsUT6ClcK8QL8BOSpY8FPVbDiGj3Vgrr+neE9 MQamIVcexbsA1kYtVGYF7/Y6mnf/I7BuT46Aml4CEWLMhaMqslJmGZaAWeB9S4doNXUG YR4RTOVUefzSg/tfok/7lBgPz9/TtrnBK8FC+uzj7K7bE8+774WTcR2Jc5i/CcGXt8N8 pQHD4myy3DtJyFPF3/Rezozdf2RcrDmzlpDE6GBXzhXPd6sEH3Nh3GIaqgtqthm7x3S0 S+0S6AyBK+hYdQlZkKKpGuoIrPY3ooog10gwPMkyCjpNgDMce+5z7CZTOV371JyxC9OF mGtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=olEHYzu40OnqqbZmf9dasZPYNSwAsYWGV9PGRFvxqs7XhCngWX653dwW9SoQyLBD1w ryfN2u8HZW+kFiOwIF5EuhnpKjH3q8c03xwQFddPY4NGjRbpKRxXEXoX6w8KKh5slQnF Bx+bBySKeztFjRlbLY/gdf2TDsQF6kN7xuVpi5Xe7PR8C/p6u3jr65OH4aZXU3wsLBCv Se/JDx43jrzvRTHzeUBeVHL+yQX7aVdH8BGhv+i2teL9dl49qDAjpiYV7FamU7+bz+9O KzcUPXDWIJbP1WFX/QGnxGEPQAYJuGlHid4aIkgWLMFrn+vgT1Qbnbuds4hZvZMtgPH4 7jbA== X-Gm-Message-State: AKwxyteXtiLJ3W7+Gz6QISqpev07Ymj8VJocmRoGAZFBnH+y7arCbNfO y3okUodmeQH2bdPsD95cZQ== X-Received: by 10.157.9.2 with SMTP id 2mr19813040otp.159.1516064291324; Mon, 15 Jan 2018 16:58:11 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id o83sm428512oif.56.2018.01.15.16.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 16:58:09 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id E12228F4; Mon, 15 Jan 2018 18:58:06 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id A1A5F30008E; Mon, 15 Jan 2018 18:58:04 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 18:57:57 -0600 Message-Id: <1516064279-14816-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516064279-14816-1-git-send-email-minyard@acm.org> References: <1516064279-14816-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::242 Subject: [Qemu-devel] [PATCH 5/7] ipmi: Fix macro issues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Corey Minyard Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Macro parameters should almost always have () around them when used. llvm reported an error on this. Remove redundant parenthesis and put parenthesis around the entire macros with assignments in case they are used in an expression. The macros were doing ((v) & 1) for a binary input, but that only works if v == 0 or if v & 1. Changed to !!(v) so they work for all values. Remove some unused macros. Reported in https://bugs.launchpad.net/bugs/1651167 An audit of these changes found no semantic changes; this is just cleanups for proper style and to avoid a compiler warning. Signed-off-by: Corey Minyard Reviewed-by: Eric Blake --- hw/ipmi/isa_ipmi_bt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index e098fd5..e946030 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -45,21 +45,21 @@ #define IPMI_BT_B2H_ATN_MASK (1 << IPMI_BT_B2H_ATN_BIT) #define IPMI_BT_GET_B2H_ATN(d) (((d) >> IPMI_BT_B2H_ATN_BIT) & 0x1) #define IPMI_BT_SET_B2H_ATN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ - (((v) & 1) << IPMI_BT_B2H_ATN_BIT))) + (!!(v) << IPMI_BT_B2H_ATN_BIT))) #define IPMI_BT_SMS_ATN_MASK (1 << IPMI_BT_SMS_ATN_BIT) #define IPMI_BT_GET_SMS_ATN(d) (((d) >> IPMI_BT_SMS_ATN_BIT) & 0x1) #define IPMI_BT_SET_SMS_ATN(d, v) ((d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ - (((v) & 1) << IPMI_BT_SMS_ATN_BIT))) + (!!(v) << IPMI_BT_SMS_ATN_BIT))) #define IPMI_BT_HBUSY_MASK (1 << IPMI_BT_HBUSY_BIT) #define IPMI_BT_GET_HBUSY(d) (((d) >> IPMI_BT_HBUSY_BIT) & 0x1) #define IPMI_BT_SET_HBUSY(d, v) ((d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ - (((v) & 1) << IPMI_BT_HBUSY_BIT))) + (!!(v) << IPMI_BT_HBUSY_BIT))) #define IPMI_BT_BBUSY_MASK (1 << IPMI_BT_BBUSY_BIT) #define IPMI_BT_SET_BBUSY(d, v) ((d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ - (((v) & 1) << IPMI_BT_BBUSY_BIT))) + (!!(v) << IPMI_BT_BBUSY_BIT))) /* Mask register */ @@ -69,12 +69,12 @@ #define IPMI_BT_B2H_IRQ_EN_MASK (1 << IPMI_BT_B2H_IRQ_EN_BIT) #define IPMI_BT_GET_B2H_IRQ_EN(d) (((d) >> IPMI_BT_B2H_IRQ_EN_BIT) & 0x1) #define IPMI_BT_SET_B2H_IRQ_EN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) |\ - (((v) & 1) << IPMI_BT_B2H_IRQ_EN_BIT))) + (!!(v) << IPMI_BT_B2H_IRQ_EN_BIT))) #define IPMI_BT_B2H_IRQ_MASK (1 << IPMI_BT_B2H_IRQ_BIT) #define IPMI_BT_GET_B2H_IRQ(d) (((d) >> IPMI_BT_B2H_IRQ_BIT) & 0x1) #define IPMI_BT_SET_B2H_IRQ(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ - (((v) & 1) << IPMI_BT_B2H_IRQ_BIT))) + (!!(v) << IPMI_BT_B2H_IRQ_BIT))) typedef struct IPMIBT { IPMIBmc *bmc;