From nobody Mon Feb 9 11:30:37 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486116015672440.94370517422783; Fri, 3 Feb 2017 02:00:15 -0800 (PST) Received: from localhost ([::1]:32969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZaf8-0004Ak-0V for importer@patchew.org; Fri, 03 Feb 2017 05:00:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZaM2-000447-As for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZaLx-0004Oy-Co for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:30 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:32982 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZaLx-0004OV-0p for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:25 -0500 Received: from kvm.qa.sw.ru. (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v139eIBc028065; Fri, 3 Feb 2017 12:40:19 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 3 Feb 2017 12:40:09 +0300 Message-Id: <20170203094018.15493-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170203094018.15493-1-vsementsov@virtuozzo.com> References: <20170203094018.15493-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 15/24] qcow2: add .bdrv_can_store_new_dirty_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, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Realize .bdrv_can_store_new_dirty_bitmap interface. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/qcow2-bitmap.c | 40 ++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 4 ++++ 3 files changed, 45 insertions(+) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 151f5e9173..94a7bc5421 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1193,3 +1193,43 @@ fail: =20 bitmap_list_free(bm_list); } + +bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp) +{ + BDRVQcow2State *s =3D bs->opaque; + const char *reason =3D NULL; + bool found; + Qcow2BitmapList *bm_list; + + if (check_constraints_on_bitmap(bs, name, granularity) !=3D 0) { + reason =3D "it doesn't satisfy the constraints"; + goto common_errp; + } + + if (s->nb_bitmaps =3D=3D 0) { + return true; + } + + bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp); + if (bm_list =3D=3D NULL) { + return false; + } + + found =3D find_bitmap_by_name(bm_list, name); + bitmap_list_free(bm_list); + if (found) { + reason =3D "bitmap with the same name is already stored"; + goto common_errp; + } + + return true; + +common_errp: + error_setg(errp, "Can't make bitmap '%s' persistent in '%s', as %s.", + name, bdrv_get_device_or_node_name(bs), reason); + return false; +} diff --git a/block/qcow2.c b/block/qcow2.c index 9cf1d9f8e7..166a43bd05 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3543,6 +3543,7 @@ BlockDriver bdrv_qcow2 =3D { =20 .bdrv_load_autoloading_dirty_bitmaps =3D qcow2_load_autoloading_dirty_= bitmaps, .bdrv_store_persistent_dirty_bitmaps =3D qcow2_store_persistent_dirty_= bitmaps, + .bdrv_can_store_new_dirty_bitmap =3D qcow2_can_store_new_dirty_bitmap, }; =20 static void bdrv_qcow2_init(void) diff --git a/block/qcow2.h b/block/qcow2.h index d9a7643a60..749710dc37 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -616,5 +616,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *= c, void **table); /* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **er= rp); void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp); +bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp); =20 #endif --=20 2.11.0