From nobody Mon Nov 3 18:06:04 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152989790624367.22293424103418; Sun, 24 Jun 2018 20:38:26 -0700 (PDT) Received: from localhost ([::1]:44053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXIKf-00010N-HS for importer@patchew.org; Sun, 24 Jun 2018 23:38:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXIJI-0000LT-Qi for qemu-devel@nongnu.org; Sun, 24 Jun 2018 23:37:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXIJH-0007F8-W8 for qemu-devel@nongnu.org; Sun, 24 Jun 2018 23:37:00 -0400 Received: from [210.13.242.136] (port=42159 helo=localhost.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXIJB-0007DH-ON; Sun, 24 Jun 2018 23:36:54 -0400 Received: by localhost.localdomain (Postfix, from userid 0) id 7E4D51046ACD; Mon, 25 Jun 2018 11:36:51 +0800 (CST) From: 13466399134@163.com To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 25 Jun 2018 11:36:43 +0800 Message-Id: <20180625033643.14404-1-13466399134@163.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-detected-operating-system: by eggs.gnu.org: Mac OS X [generic] [fuzzy] X-Received-From: 210.13.242.136 Subject: [Qemu-devel] block/dirty-bitmap: Useless bitmaps in image can be removed 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, yaoxu <13466399134@163.com>, armbru@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If qemu-kvm quit without saving bitmaps to image(coredump, host kernel pani= c, or host pooweroff), bitmaps in image can not be safely used anymore, and al= so can not be removed. Useless bitmaps should be removed. Signed-off-by: yaoxu <13466399134@163.com> --- diff --git a/blockdev.c b/blockdev.c index 58d7570932..c85056a74b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2837,31 +2837,35 @@ void qmp_block_dirty_bitmap_remove(const char *node= , const char *name, Error *local_err =3D NULL; =20 bitmap =3D block_dirty_bitmap_lookup(node, name, &bs, errp); - if (!bitmap || !bs) { + if (!bs) { return; } =20 - if (bdrv_dirty_bitmap_frozen(bitmap)) { - error_setg(errp, - "Bitmap '%s' is currently frozen and cannot be removed", - name); - return; - } else if (bdrv_dirty_bitmap_qmp_locked(bitmap)) { - error_setg(errp, - "Bitmap '%s' is currently locked and cannot be removed", - name); + if (bitmap) { + if (bdrv_dirty_bitmap_frozen(bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently frozen and cannot be remo= ved", + name); + return; + } else if (bdrv_dirty_bitmap_qmp_locked(bitmap)) { + error_setg(errp, + "Bitmap '%s' is currently locked and cannot be remo= ved", + name); + return; + } + } + + bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); return; } =20 - if (bdrv_dirty_bitmap_get_persistance(bitmap)) { - bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } + if (bitmap) { + bdrv_release_dirty_bitmap(bs, bitmap); } =20 - bdrv_release_dirty_bitmap(bs, bitmap); + if (*errp) { + error_free(*errp); + *errp =3D NULL; + } } =20 /**