diff mbox

[v2,1/2] qdev: Fix 32-bit compilation in print_size

Message ID 1375208443-17288-2-git-send-email-rth@twiddle.net
State New
Headers show

Commit Message

Richard Henderson July 30, 2013, 6:20 p.m. UTC 
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 hw/core/qdev-properties.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andreas Färber July 31, 2013, 7:46 a.m. UTC | #1 
Anthony,

Am 30.07.2013 20:20, schrieb Richard Henderson:
> Signed-off-by: Richard Henderson <rth@twiddle.net>

FWIW

Reviewed-by: Andreas Färber <afaerber@suse.de>

This is a build fix, can you please review and apply 1/2?
2/2 was outside my quick understanding so I'm not sure. ;)

rth, you forgot to mark it "for-1.6".

Regards,
Andreas

> ---
>  hw/core/qdev-properties.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 8d43a8d..d6d10c9 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]);
>
diff mbox

Patch

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 8d43a8d..d6d10c9 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]);