[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/43] block: Use BlockBackend for I/O in bdrv_commit
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 35/43] block: Use BlockBackend for I/O in bdrv_commit() |
Date: |
Tue, 5 Jul 2016 17:50:44 +0200 |
Just like block jobs, the HMP commit command should use its own
BlockBackend for doing I/O on BlockDriverStates.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
---
block/commit.c | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 4ac3df3..379efb7 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -289,6 +289,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState
*base,
/* commit COW file into the raw image */
int bdrv_commit(BlockDriverState *bs)
{
+ BlockBackend *src, *backing;
BlockDriver *drv = bs->drv;
int64_t sector, total_sectors, length, backing_length;
int n, ro, open_flags;
@@ -316,13 +317,19 @@ int bdrv_commit(BlockDriverState *bs)
}
}
- length = bdrv_getlength(bs);
+ src = blk_new();
+ blk_insert_bs(src, bs);
+
+ backing = blk_new();
+ blk_insert_bs(backing, bs->backing->bs);
+
+ length = blk_getlength(src);
if (length < 0) {
ret = length;
goto ro_cleanup;
}
- backing_length = bdrv_getlength(bs->backing->bs);
+ backing_length = blk_getlength(backing);
if (backing_length < 0) {
ret = backing_length;
goto ro_cleanup;
@@ -332,7 +339,7 @@ int bdrv_commit(BlockDriverState *bs)
* grow the backing file image if possible. If not possible,
* we must return an error */
if (length > backing_length) {
- ret = bdrv_truncate(bs->backing->bs, length);
+ ret = blk_truncate(backing, length);
if (ret < 0) {
goto ro_cleanup;
}
@@ -340,9 +347,9 @@ int bdrv_commit(BlockDriverState *bs)
total_sectors = length >> BDRV_SECTOR_BITS;
- /* qemu_try_blockalign() for bs will choose an alignment that works for
- * bs->backing->bs as well, so no need to compare the alignment manually.
*/
- buf = qemu_try_blockalign(bs, COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE);
+ /* blk_try_blockalign() for src will choose an alignment that works for
+ * backing as well, so no need to compare the alignment manually. */
+ buf = blk_try_blockalign(src, COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE);
if (buf == NULL) {
ret = -ENOMEM;
goto ro_cleanup;
@@ -354,12 +361,14 @@ int bdrv_commit(BlockDriverState *bs)
goto ro_cleanup;
}
if (ret) {
- ret = bdrv_read(bs, sector, buf, n);
+ ret = blk_pread(src, sector * BDRV_SECTOR_SIZE, buf,
+ n * BDRV_SECTOR_SIZE);
if (ret < 0) {
goto ro_cleanup;
}
- ret = bdrv_write(bs->backing->bs, sector, buf, n);
+ ret = blk_pwrite(backing, sector * BDRV_SECTOR_SIZE, buf,
+ n * BDRV_SECTOR_SIZE, 0);
if (ret < 0) {
goto ro_cleanup;
}
@@ -371,21 +380,22 @@ int bdrv_commit(BlockDriverState *bs)
if (ret < 0) {
goto ro_cleanup;
}
- bdrv_flush(bs);
+ blk_flush(src);
}
/*
* Make sure all data we wrote to the backing device is actually
* stable on disk.
*/
- if (bs->backing) {
- bdrv_flush(bs->backing->bs);
- }
+ blk_flush(backing);
ret = 0;
ro_cleanup:
qemu_vfree(buf);
+ blk_unref(src);
+ blk_unref(backing);
+
if (ro) {
/* ignoring error return here */
bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, NULL);
--
1.8.3.1
- [Qemu-devel] [PULL 23/43] block: Use bool as appropriate for BDS members, (continued)
- [Qemu-devel] [PULL 23/43] block: Use bool as appropriate for BDS members, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 25/43] block/qdev: Fix NULL access when using BB twice, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 26/43] vvfat: Use BdrvChild for s->qcow, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 28/43] vhdx: Some more BlockBackend use in vhdx_create(), Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 30/43] block: Convert bdrv_co_writev() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 29/43] block: Convert bdrv_co_readv() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 33/43] block: Convert bdrv_co_do_readv/writev to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 32/43] block: Convert bdrv_aio_writev() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 31/43] block: Convert bdrv_aio_readv() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 35/43] block: Use BlockBackend for I/O in bdrv_commit(),
Kevin Wolf <=
- [Qemu-devel] [PULL 37/43] block: Convert bdrv_write() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 36/43] block: Convert bdrv_read() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 34/43] block: Move bdrv_commit() to block/commit.c, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 41/43] block: Convert bdrv_prwv_co() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 40/43] block: Convert bdrv_pwrite_zeroes() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 39/43] block: Convert bdrv_pwrite(v/_sync) to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 43/43] block/qcow2: Don't use cpu_to_*w(), Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 42/43] block: Convert bdrv_co_preadv/pwritev to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-devel] [PULL 38/43] block: Convert bdrv_pread(v) to BdrvChild, Kevin Wolf, 2016/07/05
- Re: [Qemu-devel] [PULL 00/43] Block layer patches, Peter Maydell, 2016/07/06