From nobody Wed Nov 5 22:14:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 153756937849212.531243253941398; Fri, 21 Sep 2018 15:36:18 -0700 (PDT) Received: from localhost ([::1]:57660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3U23-0005KA-Ea for importer@patchew.org; Fri, 21 Sep 2018 18:36:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3TvN-0008RK-6S for qemu-devel@nongnu.org; Fri, 21 Sep 2018 18:29:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g3TvM-0005Yn-Fc for qemu-devel@nongnu.org; Fri, 21 Sep 2018 18:29:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g3TvI-0005UO-7A; Fri, 21 Sep 2018 18:29:16 -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 8BB19308403C; Fri, 21 Sep 2018 22:29:15 +0000 (UTC) Received: from probe.redhat.com (ovpn-121-77.rdu2.redhat.com [10.10.121.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 191DC106A7B7; Fri, 21 Sep 2018 22:29:08 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 21 Sep 2018 18:28:46 -0400 Message-Id: <20180921222847.1012-6-jsnow@redhat.com> In-Reply-To: <20180921222847.1012-1-jsnow@redhat.com> References: <20180921222847.1012-1-jsnow@redhat.com> 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.40]); Fri, 21 Sep 2018 22:29:15 +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] [RFC PATCH v2 5/6] bitmaps: prohibit enable/disable on locked/frozen bitmaps 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 , vsementsov@virtuozzo.com, Fam Zheng , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We're not being consistent about this. If it's in use by an operation, the user should not be able to change the behavior of that bitmap. Signed-off-by: John Snow --- blockdev.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index 070180898f..651c50d1fa 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2058,6 +2058,13 @@ static void block_dirty_bitmap_enable_prepare(BlkAct= ionState *common, return; } =20 + if (!bdrv_dirty_bitmap_user_modifiable(state->bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently in-use by another operation a= nd cannot be enabled", + action->name); + return; + } + state->was_enabled =3D bdrv_dirty_bitmap_enabled(state->bitmap); bdrv_enable_dirty_bitmap(state->bitmap); } @@ -2092,6 +2099,13 @@ static void block_dirty_bitmap_disable_prepare(BlkAc= tionState *common, return; } =20 + if (!bdrv_dirty_bitmap_user_modifiable(state->bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently in-use by another operation a= nd cannot be disabled", + action->name); + return; + } + state->was_enabled =3D bdrv_dirty_bitmap_enabled(state->bitmap); bdrv_disable_dirty_bitmap(state->bitmap); } @@ -2892,9 +2906,9 @@ void qmp_x_block_dirty_bitmap_enable(const char *node= , const char *name, return; } =20 - if (bdrv_dirty_bitmap_frozen(bitmap)) { + if (!bdrv_dirty_bitmap_user_modifiable(bitmap)) { error_setg(errp, - "Bitmap '%s' is currently frozen and cannot be enabled", + "Bitmap '%s' is currently in-use by another operation a= nd cannot be enabled", name); return; } @@ -2913,9 +2927,9 @@ void qmp_x_block_dirty_bitmap_disable(const char *nod= e, const char *name, return; } =20 - if (bdrv_dirty_bitmap_frozen(bitmap)) { + if (!bdrv_dirty_bitmap_user_modifiable(bitmap)) { error_setg(errp, - "Bitmap '%s' is currently frozen and cannot be disabled= ", + "Bitmap '%s' is currently in-use by another operation a= nd cannot be disabled", name); return; } --=20 2.14.4