From nobody Sun May 5 08:04:21 2024 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=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152846161404166.43592043776766; Fri, 8 Jun 2018 05:40:14 -0700 (PDT) Received: from localhost ([::1]:35378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGgf-0006Af-6z for importer@patchew.org; Fri, 08 Jun 2018 08:40:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGYy-0000N8-AT for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGYv-0005fS-8O for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:32:16 -0400 Received: from relay.sw.ru ([195.214.232.25]:57570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRGYv-0005eY-0n; Fri, 08 Jun 2018 08:32:13 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fRGYr-0004kK-05; Fri, 08 Jun 2018 15:32:09 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 8 Jun 2018 15:32:08 +0300 Message-Id: <20180608123208.54033-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH] block/qcow2: save dirty_bitmaps_loaded during reopen 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, 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" This variable was introduced to handle reopens. We need it on the following qcow2_do_open, to don't try load bitmaps again. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 549fee9b69..29f7eab576 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2178,6 +2178,7 @@ static void coroutine_fn qcow2_co_invalidate_cache(Bl= ockDriverState *bs, QDict *options; Error *local_err =3D NULL; int ret; + bool dirty_bitmaps_loaded =3D s->dirty_bitmaps_loaded; =20 /* * Backing files are read-only which makes all of their metadata immut= able, @@ -2190,6 +2191,7 @@ static void coroutine_fn qcow2_co_invalidate_cache(Bl= ockDriverState *bs, qcow2_close(bs); =20 memset(s, 0, sizeof(BDRVQcow2State)); + s->dirty_bitmaps_loaded =3D dirty_bitmaps_loaded; options =3D qdict_clone_shallow(bs->options); =20 flags &=3D ~BDRV_O_INACTIVE; --=20 2.11.1