From nobody Thu Oct 30 08:11:37 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526088861460443.2369633476452; Fri, 11 May 2018 18:34:21 -0700 (PDT) Received: from localhost ([::1]:33853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHJQS-0002OM-M3 for importer@patchew.org; Fri, 11 May 2018 21:34:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHJIB-0006OB-3E for qemu-devel@nongnu.org; Fri, 11 May 2018 21:25:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHJI9-0006WN-KI for qemu-devel@nongnu.org; Fri, 11 May 2018 21:25:47 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34110 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fHJI6-0006Qg-Ee; Fri, 11 May 2018 21:25:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 125294075659; Sat, 12 May 2018 01:25:42 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF72C215CDA7; Sat, 12 May 2018 01:25:41 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 11 May 2018 21:25:32 -0400 Message-Id: <20180512012537.22478-8-jsnow@redhat.com> In-Reply-To: <20180512012537.22478-1-jsnow@redhat.com> References: <20180512012537.22478-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 12 May 2018 01:25:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 12 May 2018 01:25:42 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC PATCH 07/12] qcow2-bitmap: add basic bitmaps info 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Markus Armbruster , Max Reitz , John Snow 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" Add functions for querying the basic information inside of bitmaps. Restructure the bitmaps flags masks to facilitate providing a list of flags belonging to the bitmap(s) being queried. Signed-off-by: John Snow --- block/qcow2-bitmap.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++= ++-- block/qcow2.c | 7 +++++ block/qcow2.h | 1 + 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 60e01abfd7..811b82743a 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -49,8 +49,28 @@ =20 /* Bitmap directory entry flags */ #define BME_RESERVED_FLAGS 0xfffffffcU -#define BME_FLAG_IN_USE (1U << 0) -#define BME_FLAG_AUTO (1U << 1) + +enum BME_FLAG_BITS { + BME_FLAG_BIT__BEGIN =3D 0, + BME_FLAG_BIT_IN_USE =3D BME_FLAG_BIT__BEGIN, + BME_FLAG_BIT_AUTO =3D 1, + BME_FLAG_BIT_EXTRA =3D 2, + BME_FLAG_BIT__MAX, +}; + +#define BME_FLAG_IN_USE (1U << BME_FLAG_BIT_IN_USE) +#define BME_FLAG_AUTO (1U << BME_FLAG_BIT_AUTO) +#define BME_FLAG_EXTRA (1U << BME_FLAG_BIT_EXTRA) + +/* Correlate canonical spec values to autogenerated QAPI values */ +struct { + uint32_t mask; + int qapi_value; +} BMEFlagMap[BME_FLAG_BIT__MAX] =3D { + [BME_FLAG_BIT_IN_USE] =3D { BME_FLAG_IN_USE, BITMAP_FLAG_ENUM_IN_USE }, + [BME_FLAG_BIT_AUTO] =3D { BME_FLAG_AUTO, BITMAP_FLAG_ENUM_AUTO }, + [BME_FLAG_BIT_EXTRA] =3D { BME_FLAG_EXTRA, BITMAP_FLAG_ENUM_EXTRA_DA= TA_COMPATIBLE }, +}; =20 /* bits [1, 8] U [56, 63] are reserved */ #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001feULL @@ -663,6 +683,63 @@ static void del_bitmap_list(BlockDriverState *bs) } } =20 +static BitmapFlagEnumList *get_bitmap_flags(uint32_t flags) +{ + int i; + BitmapFlagEnumList *flist =3D NULL; + BitmapFlagEnumList *ftmp; + + while (flags) { + i =3D ctz32(flags); + ftmp =3D g_new0(BitmapFlagEnumList, 1); + if (i >=3D BME_FLAG_BIT__BEGIN && i < BME_FLAG_BIT__MAX) { + ftmp->value =3D BMEFlagMap[i].qapi_value; + } else { + ftmp->value =3D BITMAP_FLAG_ENUM_UNKNOWN; + } + ftmp->next =3D flist; + flist =3D ftmp; + flags &=3D ~(1 << i); + } + + return flist; +} + +BitmapInfoList *qcow2_get_bitmap_info(BlockDriverState *bs) +{ + Qcow2BitmapList *bm_list; + Qcow2Bitmap *bm; + BitmapInfoList *info_list =3D NULL; + BitmapInfoList *tmp; + BitmapInfo *bitmap_info; + + bm_list =3D get_bitmap_list(bs, NULL); + if (!bm_list) { + return info_list; + } + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { + bitmap_info =3D g_new0(BitmapInfo, 1); + bitmap_info->name =3D g_strdup(bm->name); + if (bm->type =3D=3D BT_DIRTY_TRACKING_BITMAP) { + bitmap_info->type =3D BITMAP_TYPE_ENUM_DIRTY_TRACKING; + } else { + bitmap_info->type =3D BITMAP_TYPE_ENUM_UNKNOWN; + } + bitmap_info->granularity =3D 1 << bm->granularity_bits; + bitmap_info->count =3D bdrv_get_dirty_count(bm->dirty_bitmap); + bitmap_info->flags =3D get_bitmap_flags(bm->flags); + bitmap_info->has_flags =3D !!bitmap_info->flags; + + tmp =3D g_new0(BitmapInfoList, 1); + tmp->value =3D bitmap_info; + tmp->next =3D info_list; + info_list =3D tmp; + } + + return info_list; +} + int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *r= es, void **refcount_table, int64_t *refcount_table_size) diff --git a/block/qcow2.c b/block/qcow2.c index 7ae9000656..0b24ecb6b2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3960,6 +3960,7 @@ static ImageInfoSpecific *qcow2_get_specific_info(Blo= ckDriverState *bs) BDRVQcow2State *s =3D bs->opaque; ImageInfoSpecific *spec_info; QCryptoBlockInfo *encrypt_info =3D NULL; + BitmapInfoList *bitmap_list =3D NULL; =20 if (s->crypto !=3D NULL) { encrypt_info =3D qcrypto_block_get_info(s->crypto, &error_abort); @@ -4016,6 +4017,12 @@ static ImageInfoSpecific *qcow2_get_specific_info(Bl= ockDriverState *bs) spec_info->u.qcow2.data->encrypt =3D qencrypt; } =20 + bitmap_list =3D qcow2_get_bitmap_info(bs); + if (bitmap_list) { + spec_info->u.qcow2.data->has_bitmaps =3D true; + spec_info->u.qcow2.data->bitmaps =3D bitmap_list; + } + return spec_info; } =20 diff --git a/block/qcow2.h b/block/qcow2.h index 796a8c914b..76bf5fa55d 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -686,5 +686,6 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverState = *bs, void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *name, Error **errp); +BitmapInfoList *qcow2_get_bitmap_info(BlockDriverState *bs); =20 #endif --=20 2.14.3