[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 09/15] block/io: turn on dirty_bitmaps for the co
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH v5 09/15] block/io: turn on dirty_bitmaps for the compressed writes |
Date: |
Mon, 4 Jul 2016 15:28:20 +0300 |
From: Pavel Butsykin <address@hidden>
Previously was added the assert:
commit 1755da16e32c15b22a521e8a38539e4b5cf367f3
Author: Paolo Bonzini <address@hidden>
Date: Thu Oct 18 16:49:18 2012 +0200
block: introduce new dirty bitmap functionality
Now the compressed write is always in coroutine and setting the bits is
done after the write, so that we can return the dirty_bitmaps for the
compressed writes.
Signed-off-by: Pavel Butsykin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Jeff Cody <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Eric Blake <address@hidden>
CC: John Snow <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
---
block/io.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/block/io.c b/block/io.c
index 82ba079..5e4e894 100644
--- a/block/io.c
+++ b/block/io.c
@@ -912,7 +912,6 @@ bdrv_driver_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
return -ENOTSUP;
}
- assert(QLIST_EMPTY(&bs->dirty_bitmaps));
return drv->bdrv_co_pwritev_compressed(bs, offset, bytes, qiov);
}
@@ -1302,6 +1301,8 @@ static int coroutine_fn
bdrv_aligned_pwritev(BlockDriverState *bs,
} else if (flags & BDRV_REQ_ZERO_WRITE) {
bdrv_debug_event(bs, BLKDBG_PWRITEV_ZERO);
ret = bdrv_co_do_pwrite_zeroes(bs, offset, bytes, flags);
+ } else if (flags & BDRV_REQ_WRITE_COMPRESSED) {
+ ret = bdrv_driver_pwritev_compressed(bs, offset, bytes, qiov);
} else {
bdrv_debug_event(bs, BLKDBG_PWRITEV);
ret = bdrv_driver_pwritev(bs, offset, bytes, qiov, flags);
@@ -1525,14 +1526,9 @@ int coroutine_fn bdrv_co_pwritev(BlockDriverState *bs,
bytes = ROUND_UP(bytes, align);
}
- if (flags & BDRV_REQ_WRITE_COMPRESSED) {
- ret = bdrv_driver_pwritev_compressed(
- bs, offset, bytes, use_local_qiov ? &local_qiov : qiov);
- } else {
- ret = bdrv_aligned_pwritev(bs, &req, offset, bytes,
- use_local_qiov ? &local_qiov : qiov,
- flags);
- }
+ ret = bdrv_aligned_pwritev(bs, &req, offset, bytes,
+ use_local_qiov ? &local_qiov : qiov,
+ flags);
fail:
--
2.1.4
- [Qemu-devel] [PATCH v5 03/15] qcow2: add qcow2_co_pwritev_compressed, (continued)
- [Qemu-devel] [PATCH v5 03/15] qcow2: add qcow2_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 01/15] block: switch blk_write_compressed() to byte-based interface, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 06/15] qcow: add qcow_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 05/15] vmdk: add vmdk_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 02/15] block/io: reuse bdrv_co_pwritev() for write compressed, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 07/15] qcow: cleanup qcow_co_pwritev_compressed to avoid the recursion, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 08/15] block: remove BlockDriver.bdrv_write_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 09/15] block/io: turn on dirty_bitmaps for the compressed writes,
Denis V. Lunev <=
- [Qemu-devel] [PATCH v5 10/15] block: simplify drive-backup, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 11/15] block: simplify blockdev-backup, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 12/15] drive-backup: added support for data compression, Denis V. Lunev, 2016/07/04
- [Qemu-devel] [PATCH v5 14/15] qemu-iotests: test backup compression in 055, Denis V. Lunev, 2016/07/04