From 83fd6dd3e77cabf6f5cc9763752628bcc9c99541 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 30 May 2016 15:53:15 +0200 Subject: block: Move bdrv_commit() to block/commit.c No code changes, just moved from one file to another. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Acked-by: Stefan Hajnoczi --- block/commit.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) (limited to 'block/commit.c') diff --git a/block/commit.c b/block/commit.c index 444333ba65..4ac3df3ffc 100644 --- a/block/commit.c +++ b/block/commit.c @@ -282,3 +282,114 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, trace_commit_start(bs, base, top, s, s->common.co, opaque); qemu_coroutine_enter(s->common.co, s); } + + +#define COMMIT_BUF_SECTORS 2048 + +/* commit COW file into the raw image */ +int bdrv_commit(BlockDriverState *bs) +{ + BlockDriver *drv = bs->drv; + int64_t sector, total_sectors, length, backing_length; + int n, ro, open_flags; + int ret = 0; + uint8_t *buf = NULL; + + if (!drv) + return -ENOMEDIUM; + + if (!bs->backing) { + return -ENOTSUP; + } + + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT_SOURCE, NULL) || + bdrv_op_is_blocked(bs->backing->bs, BLOCK_OP_TYPE_COMMIT_TARGET, NULL)) { + return -EBUSY; + } + + ro = bs->backing->bs->read_only; + open_flags = bs->backing->bs->open_flags; + + if (ro) { + if (bdrv_reopen(bs->backing->bs, open_flags | BDRV_O_RDWR, NULL)) { + return -EACCES; + } + } + + length = bdrv_getlength(bs); + if (length < 0) { + ret = length; + goto ro_cleanup; + } + + backing_length = bdrv_getlength(bs->backing->bs); + if (backing_length < 0) { + ret = backing_length; + goto ro_cleanup; + } + + /* If our top snapshot is larger than the backing file image, + * 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); + if (ret < 0) { + goto ro_cleanup; + } + } + + 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); + if (buf == NULL) { + ret = -ENOMEM; + goto ro_cleanup; + } + + for (sector = 0; sector < total_sectors; sector += n) { + ret = bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n); + if (ret < 0) { + goto ro_cleanup; + } + if (ret) { + ret = bdrv_read(bs, sector, buf, n); + if (ret < 0) { + goto ro_cleanup; + } + + ret = bdrv_write(bs->backing->bs, sector, buf, n); + if (ret < 0) { + goto ro_cleanup; + } + } + } + + if (drv->bdrv_make_empty) { + ret = drv->bdrv_make_empty(bs); + if (ret < 0) { + goto ro_cleanup; + } + bdrv_flush(bs); + } + + /* + * Make sure all data we wrote to the backing device is actually + * stable on disk. + */ + if (bs->backing) { + bdrv_flush(bs->backing->bs); + } + + ret = 0; +ro_cleanup: + qemu_vfree(buf); + + if (ro) { + /* ignoring error return here */ + bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, NULL); + } + + return ret; +} -- cgit v1.2.3-55-g7522 From f8e2bd538d2c7baccbed0f22b02d08290959ba95 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 30 May 2016 16:29:47 +0200 Subject: block: Use BlockBackend for I/O in bdrv_commit() Just like block jobs, the HMP commit command should use its own BlockBackend for doing I/O on BlockDriverStates. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Acked-by: Stefan Hajnoczi --- block/commit.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'block/commit.c') diff --git a/block/commit.c b/block/commit.c index 4ac3df3ffc..379efb7c92 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); -- cgit v1.2.3-55-g7522