Patchwork [for,1.6] hw/core: Fix wrong left shift (build regression)

login
register
mail settings
Submitter Stefan Weil
Date July 31, 2013, 5 a.m.
Message ID <1375246847-30624-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/263582/
State Superseded
Headers show

Comments

Stefan Weil - July 31, 2013, 5 a.m.
Shifting a long int (32 bit) by 40 bit positions won't work.
Compiler message:

hw/core/qdev-properties.c: In function ‘print_size’:
hw/core/qdev-properties.c:1180:5: warning: left shift count >= width of type

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/core/qdev-properties.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Andreas Färber - July 31, 2013, 7:41 a.m.
Am 31.07.2013 07:00, schrieb Stefan Weil:
> Shifting a long int (32 bit) by 40 bit positions won't work.
> Compiler message:
> 
> hw/core/qdev-properties.c: In function ‘print_size’:
> hw/core/qdev-properties.c:1180:5: warning: left shift count >= width of type
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/core/qdev-properties.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Compare rth's patch:
http://patchwork.ozlabs.org/patch/263513/

Andreas

> 
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 8d43a8d..e82ab87 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1177,7 +1177,7 @@ static int print_size(DeviceState *dev, Property *prop, char *dest, size_t len)
>      int i = 0;
>      uint64_t div;
>  
> -    for (div = (long int)1 << 40; !(*ptr / div) ; div >>= 10) {
> +    for (div = 1ULL << 40; !(*ptr / div); div >>= 10) {
>          i++;
>      }
>      return snprintf(dest, len, "%0.03f%c", (double)*ptr/div, suffixes[i]);
>

Patch

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 8d43a8d..e82ab87 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1177,7 +1177,7 @@  static int print_size(DeviceState *dev, Property *prop, char *dest, size_t len)
     int i = 0;
     uint64_t div;
 
-    for (div = (long int)1 << 40; !(*ptr / div) ; div >>= 10) {
+    for (div = 1ULL << 40; !(*ptr / div); div >>= 10) {
         i++;
     }
     return snprintf(dest, len, "%0.03f%c", (double)*ptr/div, suffixes[i]);