From nobody Tue Nov 4 15:31:26 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=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530021306580720.7769106234464; Tue, 26 Jun 2018 06:55:06 -0700 (PDT) Received: from localhost ([::1]:52851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXoQu-0006zO-MN for importer@patchew.org; Tue, 26 Jun 2018 09:55:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXoMy-00049p-BU for qemu-devel@nongnu.org; Tue, 26 Jun 2018 09:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXoMv-0006KQ-3z for qemu-devel@nongnu.org; Tue, 26 Jun 2018 09:50:56 -0400 Received: from relay.sw.ru ([185.231.240.75]:52512) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXoMu-0006Ji-CY; Tue, 26 Jun 2018 09:50:53 -0400 Received: from mwa-fw01.virtuozzo.com ([185.231.240.15] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fXoMh-000357-PV; Tue, 26 Jun 2018 16:50:39 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 26 Jun 2018 16:50:32 +0300 Message-Id: <20180626135035.133432-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180626135035.133432-1-vsementsov@virtuozzo.com> References: <20180626135035.133432-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 3/6] bloc/qcow2: drop dirty_bitmaps_loaded state variable 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, famz@redhat.com, quintela@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, jsnow@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 doesn't work as it should, because it is actually cleared in qcow2_co_invalidate_cache() by memset(). Drop it, as the following patch will introduce new behavior. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.h | 1 - block/qcow2.c | 19 ++----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 01b5250415..c9df19b6e6 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -294,7 +294,6 @@ typedef struct BDRVQcow2State { uint32_t nb_bitmaps; uint64_t bitmap_directory_size; uint64_t bitmap_directory_offset; - bool dirty_bitmaps_loaded; =20 int flags; int qcow_version; diff --git a/block/qcow2.c b/block/qcow2.c index 46194a33ca..0044ff58e7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1149,7 +1149,6 @@ static int coroutine_fn qcow2_do_open(BlockDriverStat= e *bs, QDict *options, uint64_t ext_end; uint64_t l1_vm_state_index; bool update_header =3D false; - bool header_updated =3D false; =20 ret =3D bdrv_pread(bs->file, 0, &header, sizeof(header)); if (ret < 0) { @@ -1488,23 +1487,9 @@ static int coroutine_fn qcow2_do_open(BlockDriverSta= te *bs, QDict *options, s->autoclear_features &=3D QCOW2_AUTOCLEAR_MASK; } =20 - if (s->dirty_bitmaps_loaded) { - /* It's some kind of reopen. There are no known cases where we nee= d to - * reload bitmaps in such a situation, so it's safer to skip them. - * - * Moreover, if we have some readonly bitmaps and we are reopening= for - * rw we should reopen bitmaps correspondingly. - */ - if (bdrv_has_readonly_bitmaps(bs) && - !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTI= VE)) - { - qcow2_reopen_bitmaps_rw_hint(bs, &header_updated, &local_err); - } - } else { - header_updated =3D qcow2_load_dirty_bitmaps(bs, &local_err); - s->dirty_bitmaps_loaded =3D true; + if (qcow2_load_dirty_bitmaps(bs, &local_err)) { + update_header =3D false; } - update_header =3D update_header && !header_updated; if (local_err !=3D NULL) { error_propagate(errp, local_err); ret =3D -EINVAL; --=20 2.11.1