diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-28 13:41:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-28 13:41:03 +0000 |
| commit | c8c0a1a784cdf70ecea50e93213137c6c89337a7 (patch) | |
| tree | 3c23f59896f1a706d5a7a6d15ac860abf68f709d /block | |
| parent | a57aaa4e746177ccb9cba1742e0ed31a45710d2a (diff) | |
| parent | 51654aa52a94612edfaf76dcb51c0a0b7821c90d (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 28 Feb 2017 04:34:34 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
iscsi: add missing colons to the qapi docs
block/mirror: fix broken sparseness detection
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index 3d50857300..1b34b366d0 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -386,7 +386,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) nb_chunks * sectors_per_chunk); bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks); while (nb_chunks > 0 && sector_num < end) { - int ret; + int64_t ret; int io_sectors, io_sectors_acct; BlockDriverState *file; enum MirrorMethod { |