diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-05 14:39:00 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-06-16 07:55:00 +0800 |
| commit | f7946da274cf451d66e5207f21286fea14c4795d (patch) | |
| tree | 915225997aefc6df2f55b06fd85c966c103e5e96 | |
| parent | ae2d489c341ee98f2daad819a3812c6199481848 (diff) | |
| download | qemu-f7946da274cf451d66e5207f21286fea14c4795d.zip qemu-f7946da274cf451d66e5207f21286fea14c4795d.tar.gz qemu-f7946da274cf451d66e5207f21286fea14c4795d.tar.bz2 | |
block: use Stat64 for wr_highest_offset
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170605123908.18777-12-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
| -rw-r--r-- | block/io.c | 4 | ||||
| -rw-r--r-- | block/qapi.c | 2 | ||||
| -rw-r--r-- | include/block/block_int.h | 7 |
3 files changed, 6 insertions, 7 deletions
@@ -1405,9 +1405,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, ++bs->write_gen; bdrv_set_dirty(bs, start_sector, end_sector - start_sector); - if (bs->wr_highest_offset < offset + bytes) { - bs->wr_highest_offset = offset + bytes; - } + stat64_max(&bs->wr_highest_offset, offset + bytes); if (ret >= 0) { bs->total_sectors = MAX(bs->total_sectors, end_sector); diff --git a/block/qapi.c b/block/qapi.c index a40922e..14b60ae 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -441,7 +441,7 @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, s->node_name = g_strdup(bdrv_get_node_name(bs)); } - s->stats->wr_highest_offset = bs->wr_highest_offset; + s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset); if (bs->file) { s->has_parent = true; diff --git a/include/block/block_int.h b/include/block/block_int.h index 091b5d3..28f8b1e 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -29,6 +29,7 @@ #include "qemu/option.h" #include "qemu/queue.h" #include "qemu/coroutine.h" +#include "qemu/stats64.h" #include "qemu/timer.h" #include "qapi-types.h" #include "qemu/hbitmap.h" @@ -604,9 +605,6 @@ struct BlockDriverState { /* Callback before write request is processed */ NotifierWithReturnList before_write_notifiers; - /* Offset after the highest byte written to */ - uint64_t wr_highest_offset; - /* threshold limit for writes, in bytes. "High water mark". */ uint64_t write_threshold_offset; NotifierWithReturn write_threshold_notifier; @@ -619,6 +617,9 @@ struct BlockDriverState { QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps; + /* Offset after the highest byte written to */ + Stat64 wr_highest_offset; + /* If true, copy read backing sectors into image. Can be >1 if more * than one client has requested copy-on-read. Accessed with atomic * ops. |