From patchwork Tue Jul 25 14:41:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 9862161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE950600F5 for ; Tue, 25 Jul 2017 14:48:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CDF1286B5 for ; Tue, 25 Jul 2017 14:48:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91C26286B9; Tue, 25 Jul 2017 14:48:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 12914286B5 for ; Tue, 25 Jul 2017 14:48:06 +0000 (UTC) Received: from localhost ([::1]:32964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da182-0005rk-3H for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Jul 2017 10:48:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da125-0001r7-6a for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1da124-0000wp-FB for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:41:57 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:37270 helo=mx01.kamp.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1da124-0000v4-6E for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:41:56 -0400 Received: (qmail 15390 invoked by uid 89); 25 Jul 2017 14:41:54 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/23595. avast: 1.2.2/17010300. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.372945 secs); 25 Jul 2017 14:41:54 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 25 Jul 2017 14:41:50 -0000 X-GL_Whitelist: yes Received: (qmail 9654 invoked from network); 25 Jul 2017 14:41:40 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 25 Jul 2017 14:41:40 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 645C220ED1; Tue, 25 Jul 2017 16:41:40 +0200 (CEST) From: Peter Lieven To: qemu-block@nongnu.org Date: Tue, 25 Jul 2017 16:41:39 +0200 Message-Id: <1500993699-19299-11-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500993699-19299-1-git-send-email-pl@kamp.de> References: <1500993699-19299-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH V5 10/10] block/qcow2: add compress info to image specific 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: kwolf@redhat.com, Peter Lieven , qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, lersek@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Lieven --- block/qcow2.c | 7 +++++++ qapi/block-core.json | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 0e9c2b8..7e03877 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3968,6 +3968,13 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) spec_info->u.qcow2.data->encrypt = qencrypt; } + if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESS) { + spec_info->u.qcow2.data->compress = g_new0(Qcow2Compress, 1); + memcpy(spec_info->u.qcow2.data->compress, &s->compress, + sizeof(Qcow2Compress)); + spec_info->u.qcow2.data->has_compress = true; + } + return spec_info; } diff --git a/qapi/block-core.json b/qapi/block-core.json index d655bb1..3b338d5 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -68,6 +68,9 @@ # @encrypt: details about encryption parameters; only set if image # is encrypted (since 2.10) # +# @compress: details about parameters for compressed clusters; only set if +# the compress format header extension is present (since 2.11) +# # Since: 1.7 ## { 'struct': 'ImageInfoSpecificQCow2', @@ -76,7 +79,8 @@ '*lazy-refcounts': 'bool', '*corrupt': 'bool', 'refcount-bits': 'int', - '*encrypt': 'ImageInfoSpecificQCow2Encryption' + '*encrypt': 'ImageInfoSpecificQCow2Encryption', + '*compress': 'Qcow2Compress' } } ##