summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-09-22 08:19:10 +0200
committerKevin Wolf <kwolf@redhat.com>2013-09-25 16:21:28 +0200
commitc3e4f43a99549daa6e9b87350922e8339341c2ab (patch)
treed13985f21f5cdd6c1c783e953f4beb08e53415a6 /block
parent030be32184034261da14693b69e9582f6fe4af9d (diff)
downloadqemu-c3e4f43a99549daa6e9b87350922e8339341c2ab.zip
block: Fix compiler warning (-Werror=uninitialized)
The patch fixes a warning from gcc (Debian 4.6.3-14+rpi1) 4.6.3: block/stream.c:141:22: error: ‘copy’ may be used uninitialized in this function [-Werror=uninitialized] This is not a real bug - a better compiler would not complain. Now 'copy' has always a defined value, so the check for ret >= 0 can be removed. Signed-off-by: Stefan Weil <sw@weilnetz.de> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/stream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/block/stream.c b/block/stream.c
index 078ce4aa6a..45837f4476 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -119,11 +119,12 @@ wait:
break;
}
+ copy = false;
+
ret = bdrv_is_allocated(bs, sector_num,
STREAM_BUFFER_SIZE / BDRV_SECTOR_SIZE, &n);
if (ret == 1) {
/* Allocated in the top, no need to copy. */
- copy = false;
} else if (ret >= 0) {
/* Copy if allocated in the intermediate images. Limit to the
* known-unallocated area [sector_num, sector_num+n). */
@@ -138,7 +139,7 @@ wait:
copy = (ret == 1);
}
trace_stream_one_iteration(s, sector_num, n, ret);
- if (ret >= 0 && copy) {
+ if (copy) {
if (s->common.speed) {
delay_ns = ratelimit_calculate_delay(&s->limit, n);
if (delay_ns > 0) {