From patchwork Wed Feb 17 15:29:08 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: 8340401 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 3231EC0553 for ; Wed, 17 Feb 2016 15:40:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 977C7203B7 for ; Wed, 17 Feb 2016 15:40: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 E30FF20357 for ; Wed, 17 Feb 2016 15:40:09 +0000 (UTC) Received: from localhost ([::1]:58759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW4D3-0006zP-6B for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:40:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43V-0007Yd-Mt for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW43R-0008PZ-FJ for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:17 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:19894 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43R-0008PI-4M for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:13 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HFTHCY009256; Wed, 17 Feb 2016 18:30:01 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 18:29:08 +0300 Message-Id: <1455722949-17060-17-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 16/17] qcow2-dirty-bitmap: add AUTO 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 The bitmap should be auto-loaded if auto flag is set. For now, actually, there are no methods to set it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-dirty-bitmap.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c index 8e9fd81..cc104b5 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -40,8 +40,9 @@ #define BME_MAX_NAME_SIZE 1023 /* Bitmap directory entry flags */ -#define BME_RESERVED_FLAGS 0xfffffffe +#define BME_RESERVED_FLAGS 0xfffffffc #define BME_FLAG_IN_USE 1 +#define BME_FLAG_AUTO (1U << 1) /* bits [1, 8] U [56, 63] are reserved */ #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe @@ -50,6 +51,9 @@ typedef enum BitmapType { BT_DIRTY_TRACKING_BITMAP = 1 } BitmapType; +static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm, + Error **errp); + void qcow2_free_bitmaps(BlockDriverState *bs) { BDRVQcow2State *s = bs->opaque; @@ -213,6 +217,13 @@ static int directory_read(BlockDriverState *bs, Error **errp) bm->offset = offset; bm->name = g_strndup((char *)(h + 1), h->name_size); + if (h->flags & BME_FLAG_AUTO) { + load_bitmap(bs, bm, errp); + if (*errp != NULL) { + goto fail; + } + } + offset += dir_entry_size(h); } return 0;