From nobody Tue Nov 4 05:30:52 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 1529804743362402.1552317587922; Sat, 23 Jun 2018 18:45:43 -0700 (PDT) Received: from localhost ([::1]:40232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWu5x-0001EZ-K5 for importer@patchew.org; Sat, 23 Jun 2018 21:45:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWu50-0000o9-9V for qemu-devel@nongnu.org; Sat, 23 Jun 2018 21:44:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWu4z-0000XP-D3 for qemu-devel@nongnu.org; Sat, 23 Jun 2018 21:44:38 -0400 Received: from [101.64.179.231] (port=23937 helo=didideMacBook-Pro-334.local) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWu4u-0000U4-N3; Sat, 23 Jun 2018 21:44:33 -0400 Received: by didideMacBook-Pro-334.local (Postfix, from userid 0) id 9BF4D1042CA1; Sun, 24 Jun 2018 09:44:24 +0800 (CST) From: yaoxu@didichuxing.com To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Sun, 24 Jun 2018 09:44:22 +0800 Message-Id: <20180624014422.3237-1-yaoxu@didichuxing.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: 101.64.179.231 Subject: [Qemu-devel] block/dirty-bitmap: Useless bitmap in image should 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 , 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 in image(coredump or panic on host), bitmaps in image can not be used safely anymore, and can not be removed also. Useless bitmaps should be removed. Signed-off-by: yaoxu --- 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); + *errp =3D NULL; } =20 /**