From patchwork Wed Feb 17 15:29:04 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: 8340331 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 C8996C0553 for ; Wed, 17 Feb 2016 15:36:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 316FA203B7 for ; Wed, 17 Feb 2016 15:36:35 +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 7967420357 for ; Wed, 17 Feb 2016 15:36:34 +0000 (UTC) Received: from localhost ([::1]:58711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW49Z-0000be-Rs for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:36:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43K-00079M-5i for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW43H-0008JU-N3 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:06 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:37024 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43H-0008JF-9G for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:03 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HFTHCU009256; Wed, 17 Feb 2016 18:29:50 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 18:29:04 +0300 Message-Id: <1455722949-17060-13-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 12/17] qcow2-dirty-bitmap: add IN_USE flag 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 This flag is set on bitmap load and unset on store. If it is already set when loading the bitmap, the bitmap should not be load (it is in use by other drive or it is inconsistent (was not successfully saved)) Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-dirty-bitmap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c index 18f271f..189b74b 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -40,7 +40,8 @@ #define BME_MAX_NAME_SIZE 1023 /* Bitmap directory entry flags */ -#define BME_RESERVED_FLAGS 0xffffffff +#define BME_RESERVED_FLAGS 0xfffffffe +#define BME_FLAG_IN_USE 1 /* bits [1, 8] U [56, 63] are reserved */ #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe @@ -132,6 +133,29 @@ static QCow2BitmapHeader *bitmap_header(BDRVQcow2State *s, (s->bitmap_directory + bitmap->offset); } +static int update_bitmap_header_sync(BlockDriverState *bs, QCow2Bitmap *bitmap) +{ + int ret; + BDRVQcow2State *s = bs->opaque; + QCow2BitmapHeader *h = bitmap_header(s, bitmap); + + bitmap_header_to_be(h); + ret = bdrv_pwrite(bs->file->bs, + s->bitmap_directory_offset + bitmap->offset, + h, dir_entry_size(h)); + bitmap_header_to_cpu(h); + if (ret < 0) { + return ret; + } + + ret = bdrv_flush(bs); + if (ret < 0) { + return ret; + } + + return 0; +} + static int directory_read(BlockDriverState *bs, Error **errp) { int ret; @@ -291,6 +315,11 @@ static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm, bmh = bitmap_header(s, bm); + if (bmh->flags & BME_FLAG_IN_USE) { + error_setg(errp, "Bitmap '%s' is in use", bm->name); + return NULL; + } + bitmap_table = g_try_malloc(bmh->bitmap_table_size * sizeof(uint64_t)); if (bitmap_table == NULL) { error_setg_errno(errp, -ENOMEM, @@ -319,6 +348,13 @@ static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm, goto fail; } + bmh->flags |= BME_FLAG_IN_USE; + ret = update_bitmap_header_sync(bs, bm); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not set in_use in bitmap header"); + goto fail; + } + g_free(bitmap_table); return bitmap; @@ -767,6 +803,13 @@ void qcow2_bitmap_store(BlockDriverState *bs, goto finish; } + bmh->flags &= ~BME_FLAG_IN_USE; + ret = update_bitmap_header_sync(bs, bm); + if (ret < 0) { + error_setg_errno(errp, ret, "Can't update bitmap header."); + goto finish; + } + finish: g_free(bitmap_table); }