From patchwork Mon Aug 8 15:05:15 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: 9268563 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 4609860754 for ; Mon, 8 Aug 2016 15:19:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37946283F6 for ; Mon, 8 Aug 2016 15:19:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C308283FE; Mon, 8 Aug 2016 15:19:31 +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 C126B283F6 for ; Mon, 8 Aug 2016 15:19:30 +0000 (UTC) Received: from localhost ([::1]:58049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmKv-0003SX-G2 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:19:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7V-00071K-B3 for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7Q-0004Tz-JF for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:36 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:43843 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7Q-0004Qv-4f for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:32 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZca001857; Mon, 8 Aug 2016 02:41:39 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:15 +0300 Message-Id: <1470668720-211300-25-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 24/29] qcow2-bitmap: maintian BlockDirtyBitmap.autoload 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 Sync qcow2 dirty bitmap autload flag and BlockDirtyBitmap autoload flag Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- block/qcow2-bitmap.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index a00eae4..49066bd 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -960,15 +960,22 @@ void qcow2_bitmap_store(BlockDriverState *bs, } if (bmh == NULL) { + uint32_t flags = + bdrv_dirty_bitmap_get_autoload(bitmap) ? BME_FLAG_AUTO : 0; ret = directory_push(bs, bm_name, granularity, table_offset, - table_size, 0); + table_size, flags); if (ret < 0) { error_setg_errno(errp, ret, "Can't create dirty bitmap in qcow2."); goto fail; } } else { + uint32_t flags = bmh->flags; + flags &= ~(BME_FLAG_IN_USE | BME_FLAG_AUTO); + if (bdrv_dirty_bitmap_get_autoload(bitmap)) { + flags |= BME_FLAG_AUTO; + } ret = directory_set(bs, bmh, granularity, table_offset, table_size, - bmh->flags & ~BME_FLAG_IN_USE); + flags); if (ret < 0) { error_setg_errno(errp, ret, "Can't update dirty bitmap in qcow2."); goto fail;