From nobody Thu Nov 6 01:45:11 2025 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 1538390155636132.83744198549368; Mon, 1 Oct 2018 03:35:55 -0700 (PDT) Received: from localhost ([::1]:37184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6vYQ-0000Lk-Ed for importer@patchew.org; Mon, 01 Oct 2018 06:35:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6vSi-0005BT-7V for qemu-devel@nongnu.org; Mon, 01 Oct 2018 06:30:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6vSd-0002w8-VI for qemu-devel@nongnu.org; Mon, 01 Oct 2018 06:30:00 -0400 Received: from relay.sw.ru ([185.231.240.75]:39658) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6vSd-0002JR-Lv; Mon, 01 Oct 2018 06:29:55 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1g6vSF-0005Yj-M9; Mon, 01 Oct 2018 13:29:31 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 1 Oct 2018 13:29:17 +0300 Message-Id: <20181001102928.20533-8-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 07/18] block/backup: allow use existent copy-bitmap 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" Allow use existent copy-bitmap to make it possible to synchronize with externally created fleecing-hook filter which will be introduced soon. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/backup.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/backup.c b/block/backup.c index ad143ea735..11aa31a323 100644 --- a/block/backup.c +++ b/block/backup.c @@ -53,6 +53,7 @@ typedef struct BackupBlockJob { QLIST_HEAD(, CowRequest) inflight_reqs; =20 BdrvDirtyBitmap *copy_bitmap; + bool copy_bitmap_created; bool use_copy_range; int64_t copy_range_size; =20 @@ -307,7 +308,7 @@ static void backup_clean(Job *job) blk_unref(s->target); s->target =3D NULL; =20 - if (s->copy_bitmap) { + if (s->copy_bitmap_created) { bdrv_release_dirty_bitmap(blk_bs(s->common.blk), s->copy_bitmap); s->copy_bitmap =3D NULL; } @@ -686,11 +687,16 @@ BlockJob *backup_job_create(const char *job_id, Block= DriverState *bs, job->cluster_size =3D MAX(BACKUP_CLUSTER_SIZE_DEFAULT, bdi.cluster= _size); } =20 - if (!x_copy_bitmap) { + if (x_copy_bitmap) { + job->copy_bitmap =3D bdrv_find_dirty_bitmap(bs, x_copy_bitmap); + } else { x_copy_bitmap =3D gen_bitmap_name =3D id_generate(ID_BLOCK_BITMAP); } - job->copy_bitmap =3D bdrv_create_dirty_bitmap(bs, job->cluster_size, - x_copy_bitmap, errp); + if (!job->copy_bitmap) { + job->copy_bitmap =3D bdrv_create_dirty_bitmap(bs, job->cluster_siz= e, + x_copy_bitmap, errp); + job->copy_bitmap_created =3D !!job->copy_bitmap; + } g_free(gen_bitmap_name); if (!job->copy_bitmap) { goto error; --=20 2.18.0