Fix integer overflow in block migration bandwidth calculation
authorAvishay Traeger <AVISHAY@il.ibm.com>
Wed, 6 Apr 2011 07:45:36 +0000 (10:45 +0300)
committerKevin Wolf <kwolf@redhat.com>
Thu, 7 Apr 2011 11:51:48 +0000 (13:51 +0200)
block_mig_state.reads is an int, and multiplying by BLOCK_SIZE yielded a
negative number, resulting in a negative bandwidth (running on a 32-bit
machine).  Change order to avoid.

Signed-off-by: Avishay Traeger <avishay@il.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block-migration.c

index 8218bac..576e55a 100644 (file)
@@ -140,7 +140,7 @@ static inline void add_avg_read_time(int64_t time)
 static inline long double compute_read_bwidth(void)
 {
     assert(block_mig_state.total_time != 0);
-    return  (block_mig_state.reads * BLOCK_SIZE)/ block_mig_state.total_time;
+    return (block_mig_state.reads / block_mig_state.total_time) * BLOCK_SIZE;
 }
 
 static int bmds_aio_inflight(BlkMigDevState *bmds, int64_t sector)