aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-08-27 12:08:54 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-08-28 13:42:25 +0100
commit6d0de8eb21b7a581999ca89a9b447fd1c91e23db (patch)
tree88e78f7ca276590386bd04b793526002c0425c9b /block
parent73735f72188bd5fe25c3478aa4a2f1a17cb878d8 (diff)
mirror: fix uninitialized variable delay_ns warnings
The gcc 4.1.2 compiler warns that delay_ns may be uninitialized in mirror_iteration(). There are two break statements in the do ... while loop that skip over the delay_ns assignment. These are probably the cause of the warning. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: BenoƮt Canet <benoit.canet@nodalink.com>
Diffstat (limited to 'block')
-rw-r--r--block/mirror.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/mirror.c b/block/mirror.c
index 5e7a166b39..18b18e0353 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -157,7 +157,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
BlockDriverState *source = s->common.bs;
int nb_sectors, sectors_per_chunk, nb_chunks;
int64_t end, sector_num, next_chunk, next_sector, hbitmap_next_sector;
- uint64_t delay_ns;
+ uint64_t delay_ns = 0;
MirrorOp *op;
s->sector_num = hbitmap_iter_next(&s->hbi);
@@ -247,8 +247,6 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
next_chunk += added_chunks;
if (!s->synced && s->common.speed) {
delay_ns = ratelimit_calculate_delay(&s->limit, added_sectors);
- } else {
- delay_ns = 0;
}
} while (delay_ns == 0 && next_sector < end);