From patchwork Tue Mar 15 20:04:19 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: 8592161 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 22F9AC0553 for ; Tue, 15 Mar 2016 20:08:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7591C20263 for ; Tue, 15 Mar 2016 20:08:10 +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 AD348201FA for ; Tue, 15 Mar 2016 20:08:09 +0000 (UTC) Received: from localhost ([::1]:51179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvGC-0004Qy-VB for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Mar 2016 16:08:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDl-0008ET-Iu for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afvDg-0008In-Jk for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:37 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:36500 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDg-0008ID-7t for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:32 -0400 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u2FK4bCn005992; Tue, 15 Mar 2016 23:05:13 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2016 23:04:19 +0300 Message-Id: <1458072268-53705-14-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> References: <1458072268-53705-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 13/22] block: store persistent dirty bitmaps 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 Persistent dirty bitmaps are the bitmaps, for which the new field BdrvDirtyBitmap.file is not NULL. We save all persistent dirty bitmaps owned by BlockDriverState in corresponding bdrv_close(). BdrvDirtyBitmap.file is a BlockDriverState, where we want to save the bitmap. It may be set in bdrv_dirty_bitmap_set_file() only once. bdrv_ref/bdrv_unref are used for BdrvDirtyBitmap.file to be sure that files will be closed and resources will be freed. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 2 ++ block/dirty-bitmap.c | 35 +++++++++++++++++++++++++++++++++++ include/block/dirty-bitmap.h | 5 +++++ 3 files changed, 42 insertions(+) diff --git a/block.c b/block.c index 59a18a3..b54875e 100644 --- a/block.c +++ b/block.c @@ -2144,6 +2144,8 @@ static void bdrv_close(BlockDriverState *bs) bdrv_flush(bs); bdrv_drain(bs); /* in case flush left pending I/O */ + /* save and release persistent dirty bitmaps */ + bdrv_finalize_persistent_dirty_bitmaps(bs); bdrv_release_named_dirty_bitmaps(bs); assert(QLIST_EMPTY(&bs->dirty_bitmaps)); diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 7a44722..c9e999f 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -42,6 +42,7 @@ struct BdrvDirtyBitmap { char *name; /* Optional non-empty unique ID */ int64_t size; /* Size of the bitmap (Number of sectors) */ bool disabled; /* Bitmap is read-only */ + bool internal_persistent; /* bitmap must be saved to owner disk image */ QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -434,3 +435,37 @@ bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name) } return false; } + +void bdrv_store_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, + Error **errp) +{ + if (bs == NULL || bs->drv == NULL || + bs->drv->bdrv_dirty_bitmap_store == NULL) { + error_setg(errp, "Storing bitmap is unsupported for the format."); + return; + } + + bs->drv->bdrv_dirty_bitmap_store(bs, bitmap, errp); +} + +void bdrv_dirty_bitmap_set_internal_persistance(BdrvDirtyBitmap *bitmap, + bool persistent) +{ + bitmap->internal_persistent = persistent; +} + +void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs) +{ + BdrvDirtyBitmap *bm, *bm_next; + + QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, bm_next) { + if (bm->internal_persistent) { + Error *local_err = NULL; + bdrv_store_dirty_bitmap(bs, bm, &local_err); + if (local_err) { + error_report_err(local_err); + } + bdrv_release_dirty_bitmap(bs, bm); + } + } +} diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index f3cedaa..37b5f23 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -54,5 +54,10 @@ 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); +void bdrv_dirty_bitmap_set_internal_persistance(BdrvDirtyBitmap *bitmap, + bool persistent); +void bdrv_store_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, + Error **errp); +void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs); #endif