From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRHyQ-00009T-E7 for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:40:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRHyK-0005S5-BU for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:39:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRHyK-0005Rv-1t for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:39:52 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r928dpVW008205 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Oct 2013 04:39:51 -0400 From: Max Reitz Date: Wed, 2 Oct 2013 10:39:38 +0200 Message-Id: <1380703180-27493-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1380703180-27493-1-git-send-email-mreitz@redhat.com> References: <1380703180-27493-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v7 4/6] qcow2: Add support for ImageInfoSpecific List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Add a new ImageInfoSpecificQCow2 type as a subtype of ImageInfoSpecific. This contains the compatibility level as a string and an optional lazy_refcounts boolean (optional means mandatory for compat >= 1.1 and not available for compat == 0.10). Also, add qcow2_get_specific_info, which returns this information. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2.c | 19 +++++++++++++++++++ qapi-schema.json | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 4a9888c..396650d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1810,6 +1810,24 @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return 0; } +static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1); + + spec_info->kind = IMAGE_INFO_SPECIFIC_KIND_QCOW2; + spec_info->qcow2 = g_new0(ImageInfoSpecificQCow2, 1); + if (s->qcow_version == 2) { + spec_info->qcow2->compat = g_strdup("0.10"); + } else if (s->qcow_version == 3) { + spec_info->qcow2->compat = g_strdup("1.1"); + spec_info->qcow2->lazy_refcounts = s->use_lazy_refcounts; + spec_info->qcow2->has_lazy_refcounts = true; + } + + return spec_info; +} + #if 0 static void dump_refcounts(BlockDriverState *bs) { @@ -2130,6 +2148,7 @@ static BlockDriver bdrv_qcow2 = { .bdrv_snapshot_list = qcow2_snapshot_list, .bdrv_snapshot_load_tmp = qcow2_snapshot_load_tmp, .bdrv_get_info = qcow2_get_info, + .bdrv_get_specific_info = qcow2_get_specific_info, .bdrv_save_vmstate = qcow2_save_vmstate, .bdrv_load_vmstate = qcow2_load_vmstate, diff --git a/qapi-schema.json b/qapi-schema.json index a472d7d..17ea1c3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -210,6 +210,21 @@ 'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } } ## +# @ImageInfoSpecificQCow2: +# +# @compat: compatibility level +# +# @lazy-refcounts: #optional on or off; only valid for compat >= 1.1 +# +# Since: 1.7 +## +{ 'type': 'ImageInfoSpecificQCow2', + 'data': { + 'compat': 'str', + '*lazy-refcounts': 'bool' + } } + +## # @ImageInfoSpecific: # # A discriminated record of image format specific information structures. @@ -219,6 +234,7 @@ { 'union': 'ImageInfoSpecific', 'data': { + 'qcow2': 'ImageInfoSpecificQCow2' } } ## -- 1.8.3.1