From nobody Mon Feb 9 09:09:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549933708272454.0431812129399; Mon, 11 Feb 2019 17:08:28 -0800 (PST) Received: from localhost ([127.0.0.1]:59160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtMYj-0006uO-95 for importer@patchew.org; Mon, 11 Feb 2019 20:08:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtMVc-0004ur-FZ for qemu-devel@nongnu.org; Mon, 11 Feb 2019 20:05:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtMVU-0001IZ-MV for qemu-devel@nongnu.org; Mon, 11 Feb 2019 20:05:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtMVQ-0000sD-2O; Mon, 11 Feb 2019 20:05:00 -0500 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 47B95811D9; Tue, 12 Feb 2019 01:04:41 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-74.bos.redhat.com [10.18.17.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id E386166062; Tue, 12 Feb 2019 01:04:32 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 20:02:47 -0500 Message-Id: <20190212010248.11056-5-jsnow@redhat.com> In-Reply-To: <20190212010248.11056-1-jsnow@redhat.com> References: <20190212010248.11056-1-jsnow@redhat.com> 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.27]); Tue, 12 Feb 2019 01:04:41 +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 4/5] block/dirty-bitmap: explicitly lock bitmaps with successors 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: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Stefan Hajnoczi , John Snow , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of implying a locked status, make it explicit. Now, bitmaps in use by migration, NBD or backup operations are all treated the same way with the same code paths. Reviewed-by: Eric Blake --- block/dirty-bitmap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 1a433130ff..22c4a9e0fe 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -188,10 +188,8 @@ bool bdrv_dirty_bitmap_has_successor(BdrvDirtyBitmap *= bitmap) return bitmap->successor; } =20 -/* Both conditions disallow user-modification via QMP. */ bool bdrv_dirty_bitmap_user_locked(BdrvDirtyBitmap *bitmap) { - return bdrv_dirty_bitmap_has_successor(bitmap) || - bdrv_dirty_bitmap_qmp_locked(bitmap); + return bdrv_dirty_bitmap_qmp_locked(bitmap); } =20 void bdrv_dirty_bitmap_set_qmp_locked(BdrvDirtyBitmap *bitmap, bool qmp_lo= cked) @@ -266,8 +264,9 @@ int bdrv_dirty_bitmap_create_successor(BlockDriverState= *bs, child->disabled =3D bitmap->disabled; bitmap->disabled =3D true; =20 - /* Install the successor and freeze the parent */ + /* Install the successor and lock the parent */ bitmap->successor =3D child; + bitmap->qmp_locked =3D true; return 0; } =20 @@ -321,6 +320,7 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriver= State *bs, bitmap->successor =3D NULL; successor->persistent =3D bitmap->persistent; bitmap->persistent =3D false; + bitmap->qmp_locked =3D false; bdrv_release_dirty_bitmap(bs, bitmap); =20 return successor; @@ -349,6 +349,7 @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap_locked(Block= DriverState *bs, } =20 parent->disabled =3D successor->disabled; + parent->qmp_locked =3D false; bdrv_release_dirty_bitmap_locked(successor); parent->successor =3D NULL; =20 --=20 2.17.2