From nobody Sun Feb 8 17:32:23 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.zoho.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 1496403292426233.05205589620675; Fri, 2 Jun 2017 04:34:52 -0700 (PDT) Received: from localhost ([::1]:49065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGkqw-0001Qb-1H for importer@patchew.org; Fri, 02 Jun 2017 07:34:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGkej-0006Hp-Cn for qemu-devel@nongnu.org; Fri, 02 Jun 2017 07:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGkef-0005b1-1a for qemu-devel@nongnu.org; Fri, 02 Jun 2017 07:22:13 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47962 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 1dGkee-0005Wj-Mn for qemu-devel@nongnu.org; Fri, 02 Jun 2017 07:22:08 -0400 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 v52BLwPH031321; Fri, 2 Jun 2017 14:22:01 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 2 Jun 2017 14:21:43 +0300 Message-Id: <20170602112158.232757-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170602112158.232757-1-vsementsov@virtuozzo.com> References: <20170602112158.232757-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 v20 15/30] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap 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, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@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" Mirror AUTO flag from Qcow2 bitmap in BdrvDirtyBitmap. This will be needed in future, to save this flag back to Qcow2 for persistent bitmaps. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Reviewed-by: John Snow --- block/dirty-bitmap.c | 15 +++++++++++++++ block/qcow2-bitmap.c | 2 ++ include/block/dirty-bitmap.h | 3 +++ 3 files changed, 20 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 1c9ffb292a..8a380308c3 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -51,6 +51,8 @@ struct BdrvDirtyBitmap { (writes and discards), if bitmap is rea= donly such operations must fail and not change image or this bitmap */ + bool autoload; /* For persistent bitmaps: bitmap must be + autoloaded on image opening */ QLIST_ENTRY(BdrvDirtyBitmap) list; }; =20 @@ -77,6 +79,7 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap) assert(!bdrv_dirty_bitmap_frozen(bitmap)); g_free(bitmap->name); bitmap->name =3D NULL; + bitmap->autoload =3D false; } =20 BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, @@ -245,6 +248,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriver= State *bs, bitmap->name =3D NULL; successor->name =3D name; bitmap->successor =3D NULL; + successor->autoload =3D bitmap->autoload; + bitmap->autoload =3D false; bdrv_release_dirty_bitmap(bs, bitmap); =20 return successor; @@ -573,3 +578,13 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs) =20 return false; } + +void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload) +{ + bitmap->autoload =3D autoload; +} + +bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap) +{ + return bitmap->autoload; +} diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index a21fab8ce8..ee6d8f75a9 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -793,6 +793,8 @@ bool qcow2_load_autoloading_dirty_bitmaps(BlockDriverSt= ate *bs, Error **errp) if (bitmap =3D=3D NULL) { goto fail; } + + bdrv_dirty_bitmap_set_autoload(bitmap, true); bm->flags |=3D BME_FLAG_IN_USE; created_dirty_bitmaps =3D g_slist_append(created_dirty_bitmaps, bitmap); diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index aa6d47ee00..9416f9233f 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -79,4 +79,7 @@ bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bi= tmap); void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value); bool bdrv_has_readonly_bitmaps(BlockDriverState *bs); =20 +void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload= ); +bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap); + #endif --=20 2.11.1