[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] ipmi: Fix macro issues
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 5/7] ipmi: Fix macro issues |
Date: |
Mon, 15 Jan 2018 18:57:57 -0600 |
From: Corey Minyard <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/ipmi/isa_ipmi_bt.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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;
--
2.7.4
- [Qemu-devel] [PATCH v2] Small IPMI fixes, minyard, 2018/01/15
- [Qemu-devel] [PATCH 1/7] Add maintainer for the IPMI code, minyard, 2018/01/15
- [Qemu-devel] [PATCH 5/7] ipmi: Fix macro issues,
minyard <=
- [Qemu-devel] [PATCH 4/7] ipmi: Add the platform event message command, minyard, 2018/01/15
- [Qemu-devel] [PATCH 2/7] ipmi: Fix SEL get/set time commands, minyard, 2018/01/15
- [Qemu-devel] [PATCH 7/7] ipmi: Allow BMC device properties to be set, minyard, 2018/01/15
- [Qemu-devel] [PATCH 6/7] ipmi: disable IRQ and ATN on an external disconnect, minyard, 2018/01/15
- [Qemu-devel] [PATCH 3/7] ipmi: Don't set the timestamp on add events that don't have it, minyard, 2018/01/15
- Re: [Qemu-devel] [PATCH v2] Small IPMI fixes, Corey Minyard, 2018/01/23