diff options
| author | Eric Blake | 2019-04-03 05:05:20 +0200 |
|---|---|---|
| committer | Eric Blake | 2019-04-08 20:36:04 +0200 |
| commit | 2178a569be16b18f04ed854d24fd2281b6a429c5 (patch) | |
| tree | 47ab9097ed2740021cfb30a7a491211c681b4b6d | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-04-0... (diff) | |
| download | qemu-2178a569be16b18f04ed854d24fd2281b6a429c5.tar.gz qemu-2178a569be16b18f04ed854d24fd2281b6a429c5.tar.xz qemu-2178a569be16b18f04ed854d24fd2281b6a429c5.zip | |
nbd/server: Fix blockstatus trace
Don't increment remaining_bytes until we know that we will actually be
including the current block status extent in the reply; otherwise, the
value traced will include a bytes value that is oversized by the
length of the next block status extent which did not get sent because
it instead ended the loop.
Fixes: fb7afc79
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190403030526.12258-2-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
| -rw-r--r-- | nbd/server.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nbd/server.c b/nbd/server.c index 218a2aa5e6..1b8c861989 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1880,17 +1880,12 @@ static int blockstatus_to_extents(BlockDriverState *bs, uint64_t offset, flags = (ret & BDRV_BLOCK_ALLOCATED ? 0 : NBD_STATE_HOLE) | (ret & BDRV_BLOCK_ZERO ? NBD_STATE_ZERO : 0); - offset += num; - remaining_bytes -= num; if (first_extent) { extent->flags = flags; extent->length = num; first_extent = false; - continue; - } - - if (flags == extent->flags) { + } else if (flags == extent->flags) { /* extend current extent */ extent->length += num; } else { @@ -1903,6 +1898,8 @@ static int blockstatus_to_extents(BlockDriverState *bs, uint64_t offset, extent->flags = flags; extent->length = num; } + offset += num; + remaining_bytes -= num; } extents_end = extent + 1; |