From nobody Fri Apr 19 09:55:08 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 154410245082456.26397964381738; Thu, 6 Dec 2018 05:20:50 -0800 (PST) Received: from localhost ([::1]:41001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUta9-0001E5-SR for importer@patchew.org; Thu, 06 Dec 2018 08:20:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUtZ4-0000pv-Mz for qemu-devel@nongnu.org; Thu, 06 Dec 2018 08:19:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUtZ0-0000Li-K5 for qemu-devel@nongnu.org; Thu, 06 Dec 2018 08:19:38 -0500 Received: from relay.sw.ru ([185.231.240.75]:49798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gUtZ0-0000JS-9i; Thu, 06 Dec 2018 08:19:34 -0500 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gUtYv-0005ZG-7G; Thu, 06 Dec 2018 16:19:29 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 6 Dec 2018 16:19:28 +0300 Message-Id: <1544102368-2486-1-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v3] qemu-img info lists bitmap directory entries 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, armbru@redhat.com, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The 'Format specific information' of qemu-img info command will show the name, flags and granularity for every QCOW2 bitmap as follows: image: /vz/vmprivate/VM1/harddisk.hdd file format: qcow2 virtual size: 64G (68719476736 bytes) disk size: 3.0M cluster_size: 1048576 Format specific information: compat: 1.1 lazy refcounts: true bitmaps: [0]: flags: [0]: in-use [1]: auto name: back-up1 unknown flags: 4 granularity: 65536 [1]: flags: [0]: in-use [1]: auto name: back-up2 unknown flags: 8 granularity: 65536 refcount bits: 16 corrupt: false Signed-off-by: Andrey Shinkevich Reviewed-by: Vladimir Sementsov-Ogievskiy --- v3: Now, qcow2_get_bitmap_info_list() is invoked under the condition of QCOW version #3 to avoid memory leaks in case of QCOW version #2. Furthermore, qcow2_get_bitmap_info_list() checks the number of existing bit= maps. So, if no bitmap exists, no bitmap error message is printed in the output. The data type of the bitmap 'granularity' parameter was left as 'uint32' because bitmap_list_load() returns error if granularity_bits is grater than= 31. v2: '[PATCH v2] qemu-img info lists bitmap directory entries' The targeted version of the release at 'Since' word of the comments to the = new structures changed to 4.0 in the file qapi/block-core.json. A comment to the 'bitmaps' new member was supplied. The 'unknown flags' parameter was introduced to indicate presence of QCOW2 bitmap unknown flags, if any. The word 'dirty' was removed from the code and from the comments as we list= all the bitmaps. The 'bitmaps' printed parameter was removed for the release versions earlier than 3.x. The example of the output was moved above the 'Signed-off-by' line. The first version was '[PATCH] qemu-img info lists bitmap directory entries' block/qcow2-bitmap.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ block/qcow2.c | 8 ++++++++ block/qcow2.h | 2 ++ qapi/block-core.json | 40 ++++++++++++++++++++++++++++++++++++- 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index accebef..00b33c8 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1008,6 +1008,62 @@ fail: return false; } =20 +static Qcow2BitmapInfoFlagsList *get_bitmap_info_flags(uint32_t flags) +{ + Qcow2BitmapInfoFlagsList *list =3D NULL; + Qcow2BitmapInfoFlagsList **plist =3D &list; + + if (flags & BME_FLAG_IN_USE) { + Qcow2BitmapInfoFlagsList *entry =3D g_new0(Qcow2BitmapInfoFlagsLis= t, 1); + entry->value =3D QCOW2_BITMAP_INFO_FLAGS_IN_USE; + *plist =3D entry; + plist =3D &entry->next; + } + if (flags & BME_FLAG_AUTO) { + Qcow2BitmapInfoFlagsList *entry =3D g_new0(Qcow2BitmapInfoFlagsLis= t, 1); + entry->value =3D QCOW2_BITMAP_INFO_FLAGS_AUTO; + *plist =3D entry; + } + return list; +} + +Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, + Error **errp) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2BitmapList *bm_list; + Qcow2Bitmap *bm; + Qcow2BitmapInfoList *list =3D NULL; + Qcow2BitmapInfoList **plist =3D &list; + + if (s->nb_bitmaps =3D=3D 0) { + return NULL; + } + + bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp); + if (bm_list =3D=3D NULL) { + return NULL; + } + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { + Qcow2BitmapInfo *info =3D g_new0(Qcow2BitmapInfo, 1); + Qcow2BitmapInfoList *obj =3D g_new0(Qcow2BitmapInfoList, 1); + info->granularity =3D 1U << bm->granularity_bits; + info->name =3D g_strdup(bm->name); + info->flags =3D get_bitmap_info_flags(bm->flags); + info->unknown_flags =3D bm->flags & ~(BME_FLAG_IN_USE | BME_FLAG_A= UTO); + info->has_unknown_flags =3D !!info->unknown_flags; + obj->value =3D info; + *plist =3D obj; + plist =3D &obj->next; + } + + bitmap_list_free(bm_list); + + return list; +} + int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_update= d, Error **errp) { diff --git a/block/qcow2.c b/block/qcow2.c index 991d6ac..a023856 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4254,6 +4254,8 @@ static ImageInfoSpecific *qcow2_get_specific_info(Blo= ckDriverState *bs) BDRVQcow2State *s =3D bs->opaque; ImageInfoSpecific *spec_info; QCryptoBlockInfo *encrypt_info =3D NULL; + Error *local_err =3D NULL; + Qcow2BitmapInfoList *bitmaps; =20 if (s->crypto !=3D NULL) { encrypt_info =3D qcrypto_block_get_info(s->crypto, &error_abort); @@ -4270,6 +4272,10 @@ static ImageInfoSpecific *qcow2_get_specific_info(Bl= ockDriverState *bs) .refcount_bits =3D s->refcount_bits, }; } else if (s->qcow_version =3D=3D 3) { + bitmaps =3D qcow2_get_bitmap_info_list(bs, &local_err); + if (local_err !=3D NULL) { + error_report_err(local_err); + } *spec_info->u.qcow2.data =3D (ImageInfoSpecificQCow2){ .compat =3D g_strdup("1.1"), .lazy_refcounts =3D s->compatible_features & @@ -4279,6 +4285,8 @@ static ImageInfoSpecific *qcow2_get_specific_info(Blo= ckDriverState *bs) QCOW2_INCOMPAT_CORRUPT, .has_corrupt =3D true, .refcount_bits =3D s->refcount_bits, + .has_bitmaps =3D !!bitmaps, + .bitmaps =3D bitmaps, }; } else { /* if this assertion fails, this probably means a new version was diff --git a/block/qcow2.h b/block/qcow2.h index 8662b68..0ec2b3d 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -685,6 +685,8 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, void **refcount_table, int64_t *refcount_table_size); bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp); +Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, + Error **errp); int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_update= d, Error **errp); int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp); diff --git a/qapi/block-core.json b/qapi/block-core.json index d4fe710..55d7056 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -69,6 +69,8 @@ # @encrypt: details about encryption parameters; only set if image # is encrypted (since 2.10) # +# @bitmaps: list of qcow2 bitmaps details (since 4.0) +# # Since: 1.7 ## { 'struct': 'ImageInfoSpecificQCow2', @@ -77,7 +79,8 @@ '*lazy-refcounts': 'bool', '*corrupt': 'bool', 'refcount-bits': 'int', - '*encrypt': 'ImageInfoSpecificQCow2Encryption' + '*encrypt': 'ImageInfoSpecificQCow2Encryption', + '*bitmaps': ['Qcow2BitmapInfo'] } } =20 ## @@ -454,6 +457,41 @@ 'status': 'DirtyBitmapStatus'} } =20 ## +# @Qcow2BitmapInfoFlags: +# +# An enumeration of states that a bitmap can report to the user. +# +# @in-use: The bitmap was not saved correctly and may be inconsistent. +# +# @auto: The bitmap must reflect all changes of the virtual disk by any +# application that would write to this qcow2 file. +# +# Since: 4.0 +## +{ 'enum': 'Qcow2BitmapInfoFlags', + 'data': ['in-use', 'auto'] } + +## +# @Qcow2BitmapInfo: +# +# Qcow2 bitmap information. +# +# @name: the name of the bitmap +# +# @granularity: granularity of the bitmap in bytes +# +# @flags: flags of the bitmap +# +# @unknown-flags: unspecified flags if detected +# +# Since: 4.0 +## +{ 'struct': 'Qcow2BitmapInfo', + 'data': {'name': 'str', 'granularity': 'uint32', + 'flags': ['Qcow2BitmapInfoFlags'], + '*unknown-flags': 'uint32' } } + +## # @BlockLatencyHistogramInfo: # # Block latency histogram. --=20 1.8.3.1