From patchwork Thu Feb 1 18:53:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126586 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1980180ljc; Thu, 1 Feb 2018 11:02:20 -0800 (PST) X-Google-Smtp-Source: AH8x224xnPTA4pGb8Yah9o/ntnExxFCH36/Qxj6oehwRDRRMk+aBekcbPD/v+UypfI9ejhT2LSZT X-Received: by 10.129.32.197 with SMTP id g188mr25982470ywg.449.1517511740451; Thu, 01 Feb 2018 11:02:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511740; cv=none; d=google.com; s=arc-20160816; b=gKkaGjLB1H1keMXcUMiBp/htweQ7bQA4D1ZbBrujXC3fpYslJIhnUlj1wQsP0OsEmi 1XVul4TOb33CVp6AVnNczYdL+Yhf0dWOM7tw1/hQYJQEg//Z7XLJhGx/WRdD3EbS1jam Rfz3I1c55olCKpqcti4PUnwC29neUCKWpZKvv3rjxuw/IWS9m9JG/n1ZzRn95hcsIbJf evuJIfHaQ0JZs3NoENe09kptggEnk9yzUMF8XWwwesLhq7EvDTZGMaAySAkORRlz0haD maBdKcy14GtO8r823Yn699gGzUpK9YG9gewTkYIeP3BsRoy/3Zf2Qqi6BaMOjTxrrcx2 qmMA== 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=Z3gA4NN8ZyREXv6140Z8uopm7zZEqFTUdJfCHEONGxQomYmBxcDy74yIfTURTSNgkn ijEWspZn/Ap3yES0HkfWw89s7VTo5THkrPW3s45Y9TurP+6b0gk/CNGYRoYLDPLSMs9I 2357nh4n4wsjbt3XoasbincodU9XfmZVp+odOULORcK2UhyTfb3qpYMk2Ulo8QPGpXDy uMW4M+8uayK3WNo3Mq7fR735XRbm2YCtufZvY2c2g+AaC29TNcqo3ZYhQjCEdsOAK1qz WJFHsHFBR+8cFAZkv3EODM+/wFeZyGVaoNhOof6mW6DRXTkTgUycCwg+U1QUffag6Umo rwGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=VLyF/UoG; 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 m133si52752ywd.41.2018.02.01.11.02.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 11:02:20 -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=VLyF/UoG; 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]:54910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK7n-0002Sr-Qz for patch@linaro.org; Thu, 01 Feb 2018 14:02:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz0-0003GJ-WD for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyw-0008W8-DB for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:15 -0500 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:40490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyw-0008Vp-8d for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:10 -0500 Received: by mail-oi0-x243.google.com with SMTP id 8so2947989oix.7 for ; Thu, 01 Feb 2018 10:53:10 -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=VLyF/UoGk9hjrLd61GMofuqN0nKE5U8ODFVlpkTZQatQuhC1pqYs2urUUIqHzB7LJ6 BiDg/3vCUe2YX4yXoIVkW+mnhzy842INVCs0njGLpAkzCRw6FFInc4kh07xEdbKRaWIK XjTisZMOuHGZ5bs2Eb7TJIUg9RQkneeDO0L2lUZaFCSDk6VOoBUFsgz52nZpgZzOZ4W+ OCqHrTOTjqPLKa3gI3Qg7Eq4VfpuA4Bn9zQBYvpeSlASQvz3VVEm6gg69fBj7kl/GYUs ov3pN550cQe2U07gjOR0bB0wh8QGcaoIhO/lRWdN8jfKRMgkjgjcm5F974oTTGsgOf9D Zjyw== 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=THk7tgUV7Z43DgBC+tmWUXiuD8ezr5tzRefKEW4JLGnPMlGksDvHIukI3WiwM5NsAD dbZCS3B/N/aiJ9xjl6v79ZbS6ZRdeWjAH1vaxDigQTuY+/9RcxBJx2bYFojMf1ZSfx8c 2z0CAhb9xBiiEbt6vK18Plvp3KMMSeyLMTyG27U3v2RA7reLGWMdYaF1WRVlsyXGYCZO n3ImmibYKMXoHJPT/fvIu7H5y5QtXz2bGeMolCdLKXqTMeRYZoycjePAPm7aVj9M6oxf yMV3rUdhD1EZJ2oiaFHh7NFoa6vKbVYgrEOzuPpuiqqqR8fWPN2ABR5EdCALYfo4pHdB 2Q/Q== X-Gm-Message-State: AKwxytcv4lsA0t1naDN2mVpb9kOKc09BcCp4FcqL+eegM/E+O+qUKYDf DmcsAt/CVe16W58ZIhuKNw== X-Received: by 10.202.67.138 with SMTP id q132mr23697186oia.245.1517511189195; Thu, 01 Feb 2018 10:53:09 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id c2sm88535oia.56.2018.02.01.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:08 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 383AF79A; Thu, 1 Feb 2018 12:53:06 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 9F27B300965; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:53:00 -0600 Message-Id: <1517511182-9944-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:c06::243 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: 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;