From nobody Mon Feb 9 23:15:15 2026 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 1511853373955722.7684952631181; Mon, 27 Nov 2017 23:16:13 -0800 (PST) Received: from localhost ([::1]:36294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJa7k-0007iQ-NM for importer@patchew.org; Tue, 28 Nov 2017 02:16:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJa6B-0006lg-2s for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJa67-0000Uh-R6 for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:31 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:30019 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eJa67-0000U0-Fc for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:27 -0500 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id vAS7E9IJ023611; Tue, 28 Nov 2017 10:14:10 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 28 Nov 2017 10:14:07 +0300 Message-Id: <20171128071409.21887-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20171128071409.21887-1-vsementsov@virtuozzo.com> References: <20171128071409.21887-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 2/4] qcow2: handle reopening bitmaps on bdrv_invalidate_cache 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, vsementsov@virtuozzo.com, ehabkost@redhat.com, mreitz@redhat.com, crosa@redhat.com, den@openvz.org 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" Consider migration with shared storage. Persistent bitmaps are stored on bdrv_inactivate. Then, on destination process_incoming_migration_bh() calls bdrv_invalidate_cache_all() which leads to qcow2_load_autoloading_dirty_bitmaps() which fails if bitmaps are already loaded on destination start. In this case we should call qcow2_reopen_bitmaps_rw instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: John Snow --- block/qcow2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1914a940e5..f5f205e1b7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1450,7 +1450,13 @@ static int qcow2_do_open(BlockDriverState *bs, QDict= *options, int flags, s->autoclear_features &=3D QCOW2_AUTOCLEAR_MASK; } =20 - if (qcow2_load_autoloading_dirty_bitmaps(bs, &local_err)) { + if (bdrv_has_readonly_bitmaps(bs)) { + if (!bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTI= VE)) { + bool header_updated =3D false; + qcow2_reopen_bitmaps_rw_hint(bs, &header_updated, &local_err); + update_header =3D update_header && !header_updated; + } + } else if (qcow2_load_autoloading_dirty_bitmaps(bs, &local_err)) { update_header =3D false; } if (local_err !=3D NULL) { --=20 2.11.1