qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 18/19] hw/ide/ahci.h: Avoid shifting left into sign bit
Date: Fri,  7 Mar 2014 14:33:06 +0100	[thread overview]
Message-ID: <1394199187-9576-19-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1394199187-9576-1-git-send-email-kwolf@redhat.com>

From: Peter Maydell <peter.maydell@linaro.org>

Add 'U' suffixes to avoid undefined behaviour shifting left into
the signed bit of a signed integer type. Clang's sanitizer will
warn about this:

 hw/ide/ahci.c:1210:27: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/ide/ahci.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
index 20e412c..9a4064f 100644
--- a/hw/ide/ahci.h
+++ b/hw/ide/ahci.h
@@ -40,7 +40,7 @@
 #define AHCI_PORT_PRIV_DMA_SZ     (AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_AR_SZ + \
                                    AHCI_RX_FIS_SZ)
 
-#define AHCI_IRQ_ON_SG            (1 << 31)
+#define AHCI_IRQ_ON_SG            (1U << 31)
 #define AHCI_CMD_ATAPI            (1 << 5)
 #define AHCI_CMD_WRITE            (1 << 6)
 #define AHCI_CMD_PREFETCH         (1 << 7)
@@ -61,7 +61,7 @@
 /* HOST_CTL bits */
 #define HOST_CTL_RESET            (1 << 0)  /* reset controller; self-clear */
 #define HOST_CTL_IRQ_EN           (1 << 1)  /* global IRQ enable */
-#define HOST_CTL_AHCI_EN          (1 << 31) /* AHCI enabled */
+#define HOST_CTL_AHCI_EN          (1U << 31) /* AHCI enabled */
 
 /* HOST_CAP bits */
 #define HOST_CAP_SSC              (1 << 14) /* Slumber capable */
@@ -69,7 +69,7 @@
 #define HOST_CAP_CLO              (1 << 24) /* Command List Override support */
 #define HOST_CAP_SSS              (1 << 27) /* Staggered Spin-up */
 #define HOST_CAP_NCQ              (1 << 30) /* Native Command Queueing */
-#define HOST_CAP_64               (1 << 31) /* PCI DAC (64-bit DMA) support */
+#define HOST_CAP_64               (1U << 31) /* PCI DAC (64-bit DMA) support */
 
 /* registers for each SATA port */
 #define PORT_LST_ADDR             0x00 /* command list DMA addr */
@@ -89,7 +89,7 @@
 #define PORT_RESERVED             0x3c /* reserved */
 
 /* PORT_IRQ_{STAT,MASK} bits */
-#define PORT_IRQ_COLD_PRES        (1 << 31) /* cold presence detect */
+#define PORT_IRQ_COLD_PRES        (1U << 31) /* cold presence detect */
 #define PORT_IRQ_TF_ERR           (1 << 30) /* task file error */
 #define PORT_IRQ_HBUS_ERR         (1 << 29) /* host bus fatal error */
 #define PORT_IRQ_HBUS_DATA_ERR    (1 << 28) /* host bus data error */
@@ -151,7 +151,7 @@
 #define PORT_IRQ_STAT_HBDS        (1 << 28) /* Host Bus Data Error Status */
 #define PORT_IRQ_STAT_HBFS        (1 << 29) /* Host Bus Fatal Error Status */
 #define PORT_IRQ_STAT_TFES        (1 << 30) /* Task File Error Status */
-#define PORT_IRQ_STAT_CPDS        (1 << 31) /* Code Port Detect Status */
+#define PORT_IRQ_STAT_CPDS        (1U << 31) /* Code Port Detect Status */
 
 /* ap->flags bits */
 #define AHCI_FLAG_NO_NCQ                  (1 << 24)
-- 
1.8.1.4

  parent reply	other threads:[~2014-03-07 13:33 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 13:32 [Qemu-devel] [PULL 00/19] Block patches Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+ Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 04/19] qemu-iotests: Test progress output for conversion Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1 Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename() Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename() Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 13/19] block/raw-win32: Strip "file:" prefix on creation Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 14/19] blockdev: Fail blockdev-add with encrypted images Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 15/19] blockdev: Fix NULL pointer dereference in blockdev-add Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 16/19] qemu-iotests: Test a few blockdev-add error cases Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 17/19] block: Fix error path segfault in bdrv_open() Kevin Wolf
2014-03-07 13:33 ` Kevin Wolf [this message]
2014-03-07 13:33 ` [Qemu-devel] [PULL 19/19] block: qemu-iotests 085 - live snapshots tests Kevin Wolf
2014-03-08 12:40 ` [Qemu-devel] [PULL 00/19] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394199187-9576-19-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).