Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5060BC5B578 for ; Wed, 3 Jul 2019 22:12:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 230B821882 for ; Wed, 3 Jul 2019 22:12:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 230B821882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinTu-00080c-Dd for qemu-devel@archiver.kernel.org; Wed, 03 Jul 2019 18:12:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46097) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinEn-0005VV-UI for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hinEl-0003zu-Sr for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hinEh-0003wQ-WA; Wed, 03 Jul 2019 17:56:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5FD237F46; Wed, 3 Jul 2019 21:56:18 +0000 (UTC) Received: from probe.redhat.com (ovpn-123-117.rdu2.redhat.com [10.10.123.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 884086090E; Wed, 3 Jul 2019 21:56:16 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 17:55:30 -0400 Message-Id: <20190703215542.16123-7-jsnow@redhat.com> In-Reply-To: <20190703215542.16123-1-jsnow@redhat.com> References: <20190703215542.16123-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 03 Jul 2019 21:56:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 06/18] block/backup: add 'never' policy to bitmap sync mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , John Snow , Xie Changlong , Markus Armbruster , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Wen Congyang , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This adds a "never" policy for bitmap synchronization. Regardless of if the job succeeds or fails, we never update the bitmap. This can be used to perform differential backups, or simply to avoid the job modifying a bitmap. Signed-off-by: John Snow --- block/backup.c | 5 +++-- qapi/block-core.json | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/block/backup.c b/block/backup.c index 996941fa61..d7fdafebda 100644 --- a/block/backup.c +++ b/block/backup.c @@ -265,8 +265,9 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob= *job, int ret) BdrvDirtyBitmap *bm; BlockDriverState *bs =3D blk_bs(job->common.blk); =20 - if (ret < 0) { - /* Merge the successor back into the parent, delete nothing. */ + if (ret < 0 || job->bitmap_mode =3D=3D BITMAP_SYNC_MODE_NEVER) { + /* Failure, or we don't want to synchronize the bitmap. + * Merge the successor back into the parent, delete nothing. */ bm =3D bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL); assert(bm); } else { diff --git a/qapi/block-core.json b/qapi/block-core.json index e2226ef3ea..1007192655 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1146,10 +1146,13 @@ # @conditional: The bitmap is only synced when the operation is successf= ul. # This is the behavior always used for 'INCREMENTAL' backu= ps. # +# @never: The bitmap is never synchronized with the operation, and is +# treated solely as a read-only manifest of blocks to copy. +# # Since: 4.2 ## { 'enum': 'BitmapSyncMode', - 'data': ['conditional'] } + 'data': ['conditional', 'never'] } =20 ## # @MirrorCopyMode: --=20 2.21.0