From patchwork Wed Feb 17 15:28:59 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: 8340211 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61B5F9F399 for ; Wed, 17 Feb 2016 15:31:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF2E920320 for ; Wed, 17 Feb 2016 15:31:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9D2E20260 for ; Wed, 17 Feb 2016 15:31:44 +0000 (UTC) Received: from localhost ([::1]:58661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW44u-00017E-6L for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:31:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW434-0006fQ-PU for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:29:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW433-0008E5-JV for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:29:50 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:33063 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW433-0008Df-84 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:29:49 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HFTHCP009256; Wed, 17 Feb 2016 18:29:37 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 18:28:59 +0300 Message-Id: <1455722949-17060-8-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1455722949-17060-1-git-send-email-vsementsov@virtuozzo.com> References: <1455722949-17060-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 Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Subject: [Qemu-devel] [PATCH 07/17] qcow2-dirty-bitmap: add qcow2_bitmap_load_check() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function checks existing of the bitmap without loading it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 15 +++++++++++++++ block/qcow2-dirty-bitmap.c | 5 +++++ block/qcow2.c | 1 + block/qcow2.h | 1 + include/block/block_int.h | 2 ++ include/block/dirty-bitmap.h | 1 + 6 files changed, 25 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 982f930..115efb8 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -514,3 +514,18 @@ int bdrv_dirty_bitmap_store(const BdrvDirtyBitmap *bitmap, BlockDriverState *bs, { return hbitmap_store(bitmap->bitmap, bs, table, table_size, cluster_size); } + +bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name) +{ + BlockDriver *drv = file->drv; + if (!drv) { + return false; + } + if (drv->bdrv_dirty_bitmap_load_check) { + return drv->bdrv_dirty_bitmap_load_check(file, name); + } + if (file->file) { + return bdrv_load_check_dirty_bitmap(file->file->bs, name); + } + return false; +} diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c index 979e17e..9f8ad6b 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -274,6 +274,11 @@ static int load_bitmap_data(BlockDriverState *bs, const uint64_t *bitmap_table, return ret; } +bool qcow2_bitmap_load_check(BlockDriverState *file, const char *name) +{ + return find_bitmap_by_name(file, name) != NULL; +} + static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm, Error **errp) { diff --git a/block/qcow2.c b/block/qcow2.c index 6b6914d..0e75eeb 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3436,6 +3436,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_get_specific_info = qcow2_get_specific_info, .bdrv_dirty_bitmap_load = qcow2_bitmap_load, + .bdrv_dirty_bitmap_load_check = qcow2_bitmap_load_check, .bdrv_dirty_bitmap_store = qcow2_bitmap_store, .bdrv_save_vmstate = qcow2_save_vmstate, diff --git a/block/qcow2.h b/block/qcow2.h index e4a517c..423c279 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -620,6 +620,7 @@ int qcow2_read_snapshots(BlockDriverState *bs); void qcow2_free_bitmaps(BlockDriverState *bs); int qcow2_read_bitmaps(BlockDriverState *bs, Error **errp); +bool qcow2_bitmap_load_check(BlockDriverState *file, const char *name); BdrvDirtyBitmap *qcow2_bitmap_load(BlockDriverState *bs, const char *name, Error **errp); void qcow2_bitmap_store(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap, diff --git a/include/block/block_int.h b/include/block/block_int.h index be8f8a3..59948e9 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -214,6 +214,8 @@ struct BlockDriver { int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs); + bool (*bdrv_dirty_bitmap_load_check)(BlockDriverState *file, + const char *name); BdrvDirtyBitmap *(*bdrv_dirty_bitmap_load)(BlockDriverState *bs, const char *name, Error **errp); diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 1e16a5f..5d8c2c1 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -78,5 +78,6 @@ int bdrv_dirty_bitmap_prepare_store(const BdrvDirtyBitmap *bitmap, int bdrv_dirty_bitmap_store(const BdrvDirtyBitmap *bitmap, BlockDriverState *bs, const uint64_t *table, uint32_t table_size, uint32_t cluster_size); +bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name); #endif