From patchwork Wed Nov 9 18:17:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 692908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tDZkZ3wcpz9t1B for ; Thu, 10 Nov 2016 05:40:54 +1100 (AEDT) Received: from localhost ([::1]:41799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4Xnm-0008R7-Eq for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2016 13:40:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4XS6-0006F7-B5 for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4XS2-0004Sr-Nv for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:26 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:9793 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 1c4XS2-0004Ri-AC for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:22 -0500 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id uA9IIEg3018302; Wed, 9 Nov 2016 21:18:17 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 9 Nov 2016 21:17:50 +0300 Message-Id: <1478715476-132280-16-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> References: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 15/21] qcow2: add .bdrv_can_store_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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Realize .bdrv_can_store_dirty_bitmap interface. Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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 4230af0..166111f 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1114,3 +1114,43 @@ fail: bitmap_list_free(bm_list); } + +bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp) +{ + BDRVQcow2State *s = bs->opaque; + const char *reason = NULL; + bool found; + Qcow2BitmapList *bm_list; + + if (check_constraints_on_bitmap(bs, name, granularity) != 0) { + reason = "it doesn't satisfy the constraints"; + goto common_errp; + } + + if (s->nb_bitmaps == 0) { + return true; + } + + bm_list = bitmap_list_load(bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp); + if (bm_list == NULL) { + return false; + } + + found = !!find_bitmap_by_name(bm_list, name); + bitmap_list_free(bm_list); + if (found) { + reason = "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 8c28bb7..f08242c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3510,6 +3510,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, + .bdrv_can_store_dirty_bitmap = qcow2_can_store_dirty_bitmap, }; static void bdrv_qcow2_init(void) diff --git a/block/qcow2.h b/block/qcow2.h index 6dfa0c4..b1a6569 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -618,5 +618,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table); /* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp); void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp); +bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp); #endif