From patchwork Tue Mar 15 20:04:23 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: 8592271 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 A1446C0553 for ; Tue, 15 Mar 2016 20:13:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02A822020F for ; Tue, 15 Mar 2016 20:13:28 +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 C96132014A for ; Tue, 15 Mar 2016 20:13:26 +0000 (UTC) Received: from localhost ([::1]:51240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvLK-0007QP-1w for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Mar 2016 16:13:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDw-0008VS-1v for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afvDr-0008M2-0v for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:47 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:9187 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDq-0008KJ-ET for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:42 -0400 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u2FK4bCr005992; Tue, 15 Mar 2016 23:05:24 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2016 23:04:23 +0300 Message-Id: <1458072268-53705-18-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 17/22] 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 384ccea..f210fee 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -42,7 +42,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 @@ -134,6 +135,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; @@ -293,6 +317,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, @@ -321,6 +350,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; @@ -769,6 +805,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); }