[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 14/18] block/fleecing-hook: internal api
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v3 14/18] block/fleecing-hook: internal api |
Date: |
Mon, 1 Oct 2018 13:29:24 +0300 |
Add some functions to use fleecing-hook internally from backup job in
further commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
include/block/block.h | 9 ++++++++
block/fleecing-hook.c | 51 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index 4edc1e8afa..018751b6ea 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -710,4 +710,13 @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src,
uint64_t src_offset,
BdrvChild *dst, uint64_t dst_offset,
uint64_t bytes, BdrvRequestFlags
read_flags,
BdrvRequestFlags write_flags);
+
+
+BlockDriverState *bdrv_fleecing_hook_append(BlockDriverState *source,
+ BlockDriverState *target,
+ const char *copy_bitmap_name,
+ Error **errp);
+void bdrv_fleecing_hook_drop(BlockDriverState *hook);
+uint64_t bdrv_fleecing_hook_progress(BlockDriverState *hook);
+
#endif
diff --git a/block/fleecing-hook.c b/block/fleecing-hook.c
index f4e2f3ce83..1471b985b2 100644
--- a/block/fleecing-hook.c
+++ b/block/fleecing-hook.c
@@ -34,6 +34,8 @@ typedef struct BDRVFleecingHookState {
on guest write. */
BdrvChild *target;
bool cbw_bitmap_created;
+
+ uint64_t bytes_copied;
} BDRVFleecingHookState;
static coroutine_fn int fleecing_hook_co_preadv(
@@ -98,6 +100,7 @@ static coroutine_fn int fleecing_hook_cbw(BlockDriverState
*bs, uint64_t offset,
goto finish;
}
+ s->bytes_copied += len;
off += len;
if (off >= end) {
break;
@@ -296,3 +299,51 @@ static void bdrv_fleecing_hook_init(void)
}
block_init(bdrv_fleecing_hook_init);
+
+BlockDriverState *bdrv_fleecing_hook_append(BlockDriverState *source,
+ BlockDriverState *target,
+ const char *copy_bitmap_name,
+ Error **errp)
+{
+ QDict *opts = qdict_new();
+
+ qdict_put_str(opts, "driver", "fleecing-hook");
+ qdict_put_str(opts, "append-to", bdrv_get_node_name(source));
+ qdict_put_str(opts, "target", bdrv_get_node_name(target));
+ if (copy_bitmap_name) {
+ qdict_put_str(opts, "copy-bitmap", copy_bitmap_name);
+ }
+
+ /* set defaults like qmp_blockdev_add */
+ qdict_put_str(opts, BDRV_OPT_CACHE_DIRECT, "off");
+ qdict_put_str(opts, BDRV_OPT_CACHE_NO_FLUSH, "off");
+ qdict_put_str(opts, BDRV_OPT_READ_ONLY, "off");
+
+ return bdrv_open(NULL, NULL, opts, 0, errp);
+}
+
+void bdrv_fleecing_hook_drop(BlockDriverState *hook)
+{
+ AioContext *aio_context = bdrv_get_aio_context(hook);
+
+ aio_context_acquire(aio_context);
+
+ bdrv_drained_begin(hook);
+
+ bdrv_child_try_set_perm(hook->backing, 0, BLK_PERM_ALL, &error_abort);
+ bdrv_replace_node(hook, backing_bs(hook), &error_abort);
+ bdrv_set_backing_hd(hook, NULL, &error_abort);
+
+ bdrv_drained_end(hook);
+
+ bdrv_unref(hook);
+
+ aio_context_release(aio_context);
+}
+
+uint64_t bdrv_fleecing_hook_progress(BlockDriverState *hook)
+{
+ BDRVFleecingHookState *s = hook->opaque;
+
+ return s->bytes_copied;
+}
--
2.18.0
- [Qemu-block] [PATCH v3 00/18] fleecing-hook driver for backup, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 08/18] block: allow serialized reads to intersect, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 01/18] block/dirty-bitmap: allow set/reset bits in disabled bitmaps, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 10/18] iotests: handle -f argument correctly for qemu_io_silent, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 03/18] block/backup: simplify backup_incremental_init_copy_bitmap, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 02/18] block/io: allow BDRV_REQ_SERIALISING for read, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 14/18] block/fleecing-hook: internal api,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v3 05/18] util/id: add block-bitmap subsystem, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 06/18] block/backup: give a name to copy-bitmap, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 04/18] block/backup: move from HBitmap to BdrvDirtyBitmap, Vladimir Sementsov-Ogievskiy, 2018/10/01
- [Qemu-block] [PATCH v3 13/18] block: introduce new filter driver: fleecing-hook, Vladimir Sementsov-Ogievskiy, 2018/10/01