From nobody Sat Feb 7 06:43:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153839014311475.49888518507271; Mon, 1 Oct 2018 03:35:43 -0700 (PDT) Received: from localhost ([::1]:37178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6vYE-0000CI-1f for importer@patchew.org; Mon, 01 Oct 2018 06:35:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6vSN-0004qc-MH for qemu-devel@nongnu.org; Mon, 01 Oct 2018 06:29:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6vSK-0002LN-PO for qemu-devel@nongnu.org; Mon, 01 Oct 2018 06:29:39 -0400 Received: from relay.sw.ru ([185.231.240.75]:39694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6vSK-0002Je-E1; Mon, 01 Oct 2018 06:29:36 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1g6vSH-0005Yj-KF; Mon, 01 Oct 2018 13:29:33 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 1 Oct 2018 13:29:24 +0300 Message-Id: <20181001102928.20533-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181001102928.20533-1-vsementsov@virtuozzo.com> References: <20181001102928.20533-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v3 14/18] block/fleecing-hook: internal api X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, wencongyang2@huawei.com, xiechanglong.d@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, jsnow@redhat.com, jcody@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add some functions to use fleecing-hook internally from backup job in further commit. Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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, ui= nt64_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; =20 static coroutine_fn int fleecing_hook_co_preadv( @@ -98,6 +100,7 @@ static coroutine_fn int fleecing_hook_cbw(BlockDriverSta= te *bs, uint64_t offset, goto finish; } =20 + s->bytes_copied +=3D len; off +=3D len; if (off >=3D end) { break; @@ -296,3 +299,51 @@ static void bdrv_fleecing_hook_init(void) } =20 block_init(bdrv_fleecing_hook_init); + +BlockDriverState *bdrv_fleecing_hook_append(BlockDriverState *source, + BlockDriverState *target, + const char *copy_bitmap_name, + Error **errp) +{ + QDict *opts =3D 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 =3D 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 =3D hook->opaque; + + return s->bytes_copied; +} --=20 2.18.0