From patchwork Thu Jun 20 01:03:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 1119074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45TkRN1fbWz9s9y for ; Thu, 20 Jun 2019 11:16:16 +1000 (AEST) Received: from localhost ([::1]:42878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdlgU-0003HW-7k for incoming@patchwork.ozlabs.org; Wed, 19 Jun 2019 21:16:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40681) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdleF-0002Dv-KK for qemu-devel@nongnu.org; Wed, 19 Jun 2019 21:13:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdlUn-0004nX-3V for qemu-devel@nongnu.org; Wed, 19 Jun 2019 21:04:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54576) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdlUl-0004lS-R8; Wed, 19 Jun 2019 21:04:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 177D281126; Thu, 20 Jun 2019 01:04:07 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-164.bos.redhat.com [10.18.17.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id F14381001E67; Thu, 20 Jun 2019 01:04:05 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 19 Jun 2019 21:03:47 -0400 Message-Id: <20190620010356.19164-4-jsnow@redhat.com> In-Reply-To: <20190620010356.19164-1-jsnow@redhat.com> References: <20190620010356.19164-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 20 Jun 2019 01:04:07 +0000 (UTC) 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 03/12] 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, Wen Congyang , Xie Changlong , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 --- qapi/block-core.json | 6 +++++- block/backup.c | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 6d05ad8f47..0332dcaabc 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1146,10 +1146,14 @@ # @conditional: The bitmap is only synchronized when the operation is successul. # This is useful for Incremental semantics. # +# @never: The bitmap is never synchronized with the operation, and is +# treated solely as a manifest of blocks to copy. +# This is useful for Differential semantics. +# # Since: 4.1 ## { 'enum': 'BitmapSyncMode', - 'data': ['conditional'] } + 'data': ['conditional', 'never'] } ## # @MirrorCopyMode: diff --git a/block/backup.c b/block/backup.c index c4f83d4ef7..627f724b68 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 = blk_bs(job->common.blk); - if (ret < 0) { - /* Merge the successor back into the parent, delete nothing. */ + if (ret < 0 || job->bitmap_mode == BITMAP_SYNC_MODE_NEVER) { + /* Failure, or we don't want to synchronize the bitmap. + * Merge the successor back into the parent, delete nothing. */ bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL); assert(bm); } else {