From patchwork Mon Sep 23 12:09:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 277162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 941AC2C0097 for ; Mon, 23 Sep 2013 22:11:45 +1000 (EST) Received: from localhost ([::1]:40255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO4zP-0001N5-Az for incoming@patchwork.ozlabs.org; Mon, 23 Sep 2013 08:11:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO4xP-0007Mv-JP for qemu-devel@nongnu.org; Mon, 23 Sep 2013 08:09:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VO4xJ-0006UT-EP for qemu-devel@nongnu.org; Mon, 23 Sep 2013 08:09:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO4xJ-0006UJ-63 for qemu-devel@nongnu.org; Mon, 23 Sep 2013 08:09:33 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8NC9W5u012445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 23 Sep 2013 08:09:32 -0400 Received: from localhost (dhcp-200-247.str.redhat.com [10.33.200.247]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8NC9Vsn014133 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Mon, 23 Sep 2013 08:09:32 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 23 Sep 2013 14:09:20 +0200 Message-Id: <1379938162-14005-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1379938162-14005-1-git-send-email-mreitz@redhat.com> References: <1379938162-14005-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v5 4/6] qcow2: Add support for ImageInfoSpecific X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 318d95d..f080a8a 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 cbad705..d697da2 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' } } ##