From patchwork Mon Aug 8 15:05:05 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: 9268547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1664260754 for ; Mon, 8 Aug 2016 15:13:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0781B26D17 for ; Mon, 8 Aug 2016 15:13:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F01FB283F8; Mon, 8 Aug 2016 15:13:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id E2EAC26D17 for ; Mon, 8 Aug 2016 15:13:31 +0000 (UTC) Received: from localhost ([::1]:58020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmF8-0005yX-Tg for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:13:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7T-000705-Gw for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7Q-0004SV-5P for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:35 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:32855 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7P-0004PP-KP for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:31 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZcQ001857; Mon, 8 Aug 2016 02:41:38 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:05 +0300 Message-Id: <1470668720-211300-15-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-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 14/29] qcow2-bitmap: add qcow2_bitmap_load_check() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The function checks the existance of the bitmap without loading it. Will be used in future patches. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 15 +++++++++++++++ block/qcow2-bitmap.c | 5 +++++ block/qcow2.c | 1 + block/qcow2.h | 1 + include/block/block_int.h | 2 ++ include/block/dirty-bitmap.h | 2 ++ 6 files changed, 26 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 90af372..83415e1 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -540,3 +540,18 @@ int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap) { return hbitmap_count(bitmap->meta); } + +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-bitmap.c b/block/qcow2-bitmap.c index a34cfe8..32f1a50 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -252,6 +252,11 @@ static QCow2BitmapHeader *find_bitmap_by_name(BlockDriverState *bs, return NULL; } +bool qcow2_bitmap_load_check(BlockDriverState *file, const char *name) +{ + return find_bitmap_by_name(file, name) != NULL; +} + static void clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table, uint32_t bitmap_table_size) { diff --git a/block/qcow2.c b/block/qcow2.c index 3e9b47e..60b0acb 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3517,6 +3517,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 0ec0b31..d4515fb 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -608,6 +608,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, BdrvDirtyBitmap *bitmap, diff --git a/include/block/block_int.h b/include/block/block_int.h index ba002f3..da1f843 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -224,6 +224,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 1e17729..6007c64 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -75,4 +75,6 @@ void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap, bool finish); void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); +bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name); + #endif