[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 07/15] qcow2: move is_zero() up
From: |
Anton Nefedov |
Subject: |
[Qemu-block] [PATCH v5 07/15] qcow2: move is_zero() up |
Date: |
Wed, 1 Nov 2017 18:44:00 +0300 |
To be used in the following commit without a forward declaration.
Signed-off-by: Anton Nefedov <address@hidden>
---
block/qcow2.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 92cb9f9..db759ce 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1881,6 +1881,23 @@ static bool merge_cow(uint64_t offset, unsigned bytes,
return false;
}
+static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
+{
+ int64_t nr;
+ int res;
+
+ /* Clamp to image length, before checking status of underlying sectors */
+ if (offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) {
+ bytes = bs->total_sectors * BDRV_SECTOR_SIZE - offset;
+ }
+
+ if (!bytes) {
+ return true;
+ }
+ res = bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
+ return res >= 0 && (res & BDRV_BLOCK_ZERO) && nr == bytes;
+}
+
static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
uint64_t bytes, QEMUIOVector *qiov,
int flags)
@@ -2998,24 +3015,6 @@ finish:
return ret;
}
-
-static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
-{
- int64_t nr;
- int res;
-
- /* Clamp to image length, before checking status of underlying sectors */
- if (offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) {
- bytes = bs->total_sectors * BDRV_SECTOR_SIZE - offset;
- }
-
- if (!bytes) {
- return true;
- }
- res = bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
- return res >= 0 && (res & BDRV_BLOCK_ZERO) && nr == bytes;
-}
-
static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs,
int64_t offset, int bytes, BdrvRequestFlags flags)
{
--
2.7.4
- [Qemu-block] [PATCH v5 00/15] qcow2: space preallocation and COW improvements, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 01/15] mirror: inherit supported write/zero flags, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 02/15] blkverify: set supported write/zero flags, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 07/15] qcow2: move is_zero() up,
Anton Nefedov <=
- [Qemu-block] [PATCH v5 04/15] block: treat BDRV_REQ_ALLOCATE as serialising, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 10/15] qcow2: set inactive flag, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 06/15] block: support BDRV_REQ_ALLOCATE in passthrough drivers, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 05/15] file-posix: support BDRV_REQ_ALLOCATE, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 08/15] qcow2: skip writing zero buffers to empty COW areas, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 03/15] block: introduce BDRV_REQ_ALLOCATE flag, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 14/15] iotest 198: test BDRV_REQ_ALLOCATE, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 13/15] qcow2: do not zero out clusters if already preallocated, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 15/15] iotest 134: test cluster-misaligned encrypted write, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 09/15] qcow2: preallocation at image expand, Anton Nefedov, 2017/11/01