From nobody Tue Feb 10 00:58:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580901767176186.73291755889397; Wed, 5 Feb 2020 03:22:47 -0800 (PST) Received: from localhost ([::1]:45260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izIlZ-0007vV-Pq for importer@patchew.org; Wed, 05 Feb 2020 06:22:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52966) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izIjw-0005GE-UX for qemu-devel@nongnu.org; Wed, 05 Feb 2020 06:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izIjv-0001No-O1 for qemu-devel@nongnu.org; Wed, 05 Feb 2020 06:21:04 -0500 Received: from relay.sw.ru ([185.231.240.75]:41398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1izIjs-00015V-KA; Wed, 05 Feb 2020 06:21:00 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1izIjl-0006Jd-9v; Wed, 05 Feb 2020 14:20:53 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v4 10/10] block/qcow2-bitmap: use bdrv_dirty_bitmap_next_dirty Date: Wed, 5 Feb 2020 14:20:41 +0300 Message-Id: <20200205112041.6003-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200205112041.6003-1-vsementsov@virtuozzo.com> References: <20200205112041.6003-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" store_bitmap_data() loop does bdrv_set_dirty_iter() on each iteration, which means that we actually don't need iterator itself and we can use simpler bitmap API. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/qcow2-bitmap.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index d41f5d049b..82646c53bd 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1289,7 +1289,6 @@ static uint64_t *store_bitmap_data(BlockDriverState *= bs, uint64_t bm_size =3D bdrv_dirty_bitmap_size(bitmap); const char *bm_name =3D bdrv_dirty_bitmap_name(bitmap); uint8_t *buf =3D NULL; - BdrvDirtyBitmapIter *dbi; uint64_t *tb; uint64_t tb_size =3D size_to_clusters(s, @@ -1308,12 +1307,14 @@ static uint64_t *store_bitmap_data(BlockDriverState= *bs, return NULL; } =20 - dbi =3D bdrv_dirty_iter_new(bitmap); buf =3D g_malloc(s->cluster_size); limit =3D bytes_covered_by_bitmap_cluster(s, bitmap); assert(DIV_ROUND_UP(bm_size, limit) =3D=3D tb_size); =20 - while ((offset =3D bdrv_dirty_iter_next(dbi)) >=3D 0) { + offset =3D 0; + while ((offset =3D bdrv_dirty_bitmap_next_dirty(bitmap, offset, INT64_= MAX)) + >=3D 0) + { uint64_t cluster =3D offset / limit; uint64_t end, write_size; int64_t off; @@ -1356,23 +1357,17 @@ static uint64_t *store_bitmap_data(BlockDriverState= *bs, goto fail; } =20 - if (end >=3D bm_size) { - break; - } - - bdrv_set_dirty_iter(dbi, end); + offset =3D end; } =20 *bitmap_table_size =3D tb_size; g_free(buf); - bdrv_dirty_iter_free(dbi); =20 return tb; =20 fail: clear_bitmap_table(bs, tb, tb_size); g_free(buf); - bdrv_dirty_iter_free(dbi); g_free(tb); =20 return NULL; --=20 2.21.0