[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 10/17] block: Use BlockBackend for I/O in bdrv_commi
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 10/17] block: Use BlockBackend for I/O in bdrv_commit() |
Date: |
Tue, 21 Jun 2016 11:21:27 +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>
---
block/commit.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 4ac3df3..17f365f 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;
}
@@ -342,7 +349,7 @@ int bdrv_commit(BlockDriverState *bs)
/* 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);
+ 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
- Re: [Qemu-block] [PATCH 08/17] block: Convert bdrv_co_do_readv/writev to BdrvChild, (continued)
- [Qemu-block] [PATCH 07/17] block: Convert bdrv_aio_writev() to BdrvChild, Kevin Wolf, 2016/06/21
- [Qemu-block] [PATCH 12/17] block: Convert bdrv_write() to BdrvChild, Kevin Wolf, 2016/06/21
- Re: [Qemu-block] [PATCH 12/17] block: Convert bdrv_write() to BdrvChild, Max Reitz, 2016/06/27
- Re: [Qemu-block] [PATCH 12/17] block: Convert bdrv_write() to BdrvChild, Max Reitz, 2016/06/27
- [Qemu-block] [PATCH v2 12/17] block: Convert bdrv_write() to BdrvChild, Kevin Wolf, 2016/06/29
- Re: [Qemu-block] [PATCH v2 12/17] block: Convert bdrv_write() to BdrvChild, Max Reitz, 2016/06/29
- Re: [Qemu-block] [PATCH v2 12/17] block: Convert bdrv_write() to BdrvChild, Kevin Wolf, 2016/06/29
- Re: [Qemu-block] [PATCH v2 12/17] block: Convert bdrv_write() to BdrvChild, Max Reitz, 2016/06/29
[Qemu-block] [PATCH 10/17] block: Use BlockBackend for I/O in bdrv_commit(),
Kevin Wolf <=
[Qemu-block] [PATCH 09/17] block: Move bdrv_commit() to block/commit.c, Kevin Wolf, 2016/06/21
[Qemu-block] [PATCH 06/17] block: Convert bdrv_aio_readv() to BdrvChild, Kevin Wolf, 2016/06/21
[Qemu-block] [PATCH 13/17] block: Convert bdrv_pread(v) to BdrvChild, Kevin Wolf, 2016/06/21
[Qemu-block] [PATCH 11/17] block: Convert bdrv_read() to BdrvChild, Kevin Wolf, 2016/06/21
[Qemu-block] [PATCH 14/17] block: Convert bdrv_pwrite(v/_sync) to BdrvChild, Kevin Wolf, 2016/06/21