From patchwork Thu Dec 7 21:30:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 121077 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8884776qgn; Thu, 7 Dec 2017 13:30:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMY9URAd1GRJfCs9QRMtf4WNwnf42aafO5SOsESruid/4rcOxuVjhllJqAARmXxzRuy1REBz X-Received: by 10.13.254.131 with SMTP id o125mr3549117ywf.154.1512682257442; Thu, 07 Dec 2017 13:30:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512682257; cv=none; d=google.com; s=arc-20160816; b=iHuOu0OH7nhKomgXyF14g899SSOJQtqqnkznT24tyuifzZfVGD2z3DhpdTeVZYK5xE Yh9Dw8y099dDSgTBUo779154FdxTAM7jo/45ud9XjAr2ziO4PQKqLAplEIAR+lcqi6WW T37w1bAbaBAQQH2ihIfFStDw5RBfVk6Md86XDzB226GTx0xxeWi3a/ZKwbxk2WFC5GJ3 Wk9bbTFpm9basoG0f4SgDqUBHSxzYDBUXXzP5XAFL2+3BE3g3bs4aO/ULYpuJqe/OVgb ErOhdL7e01PHpZyj2ugN+rUF/dkmqKO1h9Ooo4BIVpNNQrK7JtiQVRqDxbtIGud4zedu IM8A== 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=FPvbIQAJwDholvfOTmxL4gvQanZKI49FHyohI781HTI=; b=jR5NIxS/AMFgBKJLm58Xsf7F3S415bxgKQnYyibQ41zaW53JzRXbKyV7poQlwgQ0Cm lhIpSL6M6FR43gvfwnUcMeAh68H3et5hSudcg6lwCXhsE27piMK7MIugKakhDuib75hK 6jJCGDV+sRY2qRmQrQ2wsqlGRlOZ3J2pYSJSxagPrXP2pkVAf3sN6SfcNstwsamFBS79 JEMMpes0/PD+vRM/0mq7kUbMXDt4Os6hBb2onycRpnTDN00PyvINoeMtOBlrUkMvoxki UMhk7NqZlrRCnj8M2+tJq5uUX9S2Mj/j9jIW8mUgNqYBhbMA2lKOW5Pz9umBzK+vU+HY h35w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZagYmN3a; 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 b184si1329590ybb.774.2017.12.07.13.30.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 13:30:57 -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=ZagYmN3a; 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]:34406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3ku-0005Zv-PC for patch@linaro.org; Thu, 07 Dec 2017 16:30:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3kS-0005YX-28 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN3kQ-0001wL-T0 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:28 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:32916) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN3kQ-0001vq-M6 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:26 -0500 Received: by mail-pf0-x243.google.com with SMTP id y89so5652856pfk.0 for ; Thu, 07 Dec 2017 13:30:26 -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=FPvbIQAJwDholvfOTmxL4gvQanZKI49FHyohI781HTI=; b=ZagYmN3aAolNkpqx5hAJ876JZmE5ZHPB+dXxnn+yqqLwwVx+eyAVe9rM6k3YMdekA7 VgLBbRIp1j2V8kTglFM3tSMVNaBejBKrtCzdLqOXpWn6gsu05aAwgZ+1JoRkBZOfgUwF /Kn6YoioVqZJalUMIKso2FT4uU4LKoHWquViHB88IwJYYATFefrFpe3T9EtbxgRqDKGc rA7kgeNrf6oXwhAUewTBSZy96cocmiAxM/FlSNOHWEKZvODZX8xphpXTAZjbYswkFv9M BXfGscPKdpUTgKegee4Lml32Acl0zbOgUBmVpBdUoZeeAXSLLE3LzC6h9UmTUdgeDyJ2 3gMQ== 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=FPvbIQAJwDholvfOTmxL4gvQanZKI49FHyohI781HTI=; b=akZuXZzGS2C7VYRMUwcecZDOAl5Ojf0eTMwz3WUJJOmFg/iWFY0dAtYuGC5lzy9eMd YucbNFXBkJSWNi/Bv4X69xdXL+lx9GEUYW+RuRQUDknANqS9Kg4S75fxoxEua6sJRhXp 0zOtVZhEmfqrd45nD1HOjE2zvLIi5DbiBAKvO9sjhVvC7oZpiLg0COXYErQqYWfrVttm 015/6MAn6R3k3GB+0eZmCGvUxRm3u8hL9Gc1pv7q903SDQifzwGxAUMyvPd8nItw1i7L YjkHkslSYHmLC87oRGBe1LDuUfi8AVLQshL0tXrv7kcTNoKTWIKkMnt9MrLgP0pFw8Dp o4aw== X-Gm-Message-State: AJaThX5qtV2oAESBWFoGXZEHQcwF2yOLOR/meKseOLr84z+hnuMFNlj6 BPwEPEQ+Cq76qa6VfsrXqQ== X-Received: by 10.99.97.200 with SMTP id v191mr25608159pgb.300.1512682225630; Thu, 07 Dec 2017 13:30:25 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id b6sm11067995pfe.57.2017.12.07.13.30.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:30:23 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 3D4B2BD7; Thu, 7 Dec 2017 15:30:21 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 4E86630000E; Thu, 7 Dec 2017 15:30:18 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:30:09 -0600 Message-Id: <1512682213-4354-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512682213-4354-1-git-send-email-minyard@acm.org> References: <1512682213-4354-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:400e:c00::243 Subject: [Qemu-devel] [PATCH 4/8] 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 2fcc3d2..13a8c09 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -46,21 +46,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 */ @@ -70,12 +70,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;