From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490186023639428.291919611122; Wed, 22 Mar 2017 05:33:43 -0700 (PDT) Received: from localhost ([::1]:50768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfSQ-0004zI-EG for importer@patchew.org; Wed, 22 Mar 2017 08:33:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfNG-00013k-7Y for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfNF-000462-2P for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfNE-00045Y-Pb for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5668804E4; Wed, 22 Mar 2017 12:28:20 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22D1A7D85F; Wed, 22 Mar 2017 12:28:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D5668804E4 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D5668804E4 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:01 +0000 Message-Id: <20170322111608.31230-2-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 22 Mar 2017 12:28:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/8] block: add bdrv_measure() API 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" bdrv_measure() provides a conservative maximum for the size of a new image. This information is handy if storage needs to be allocated (e.g. a SAN or an LVM volume) ahead of time. Signed-off-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia --- qapi/block-core.json | 25 +++++++++++++++++++++++++ include/block/block.h | 4 ++++ include/block/block_int.h | 2 ++ block.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 0f132fc..42fb90e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -463,6 +463,31 @@ '*dirty-bitmaps': ['BlockDirtyInfo'] } } =20 ## +# @BlockMeasureInfo: +# +# Image size calculation information. This structure describes the size +# requirements for creating a new image file. +# +# The size requirements depend on the new image file format. File size al= ways +# equals virtual disk size for the 'raw' format. Compact formats such as +# 'qcow2' represent unallocated and zero regions efficiently so file size = may +# be smaller than virtual disk size. +# +# The values are upper bounds that are guaranteed to fit the new image fil= e. +# Subsequent modification, such as internal snapshot or bitmap creation, m= ay +# require additional space and is not covered here. +# +# @required: Size required for a new image file, in bytes. +# +# @fully-allocated: Image file size, in bytes, once data has been written +# to all sectors. +# +# Since: 2.10 +## +{ 'struct': 'BlockMeasureInfo', + 'data': {'required': 'int', 'fully-allocated': 'int'} } + +## # @query-block: # # Get a list of BlockInfo for all virtual block devices. diff --git a/include/block/block.h b/include/block/block.h index 5149260..43c789f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -298,6 +298,10 @@ int bdrv_truncate(BdrvChild *child, int64_t offset); int64_t bdrv_nb_sectors(BlockDriverState *bs); int64_t bdrv_getlength(BlockDriverState *bs); int64_t bdrv_get_allocated_file_size(BlockDriverState *bs); +void bdrv_measure(BlockDriver *drv, QemuOpts *opts, + BlockDriverState *in_bs, + BlockMeasureInfo *info, + Error **errp); void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); void bdrv_refresh_limits(BlockDriverState *bs, Error **errp); int bdrv_commit(BlockDriverState *bs); diff --git a/include/block/block_int.h b/include/block/block_int.h index 59400bd..5099a58 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -201,6 +201,8 @@ struct BlockDriver { int64_t (*bdrv_getlength)(BlockDriverState *bs); bool has_variable_length; int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs); + void (*bdrv_measure)(QemuOpts *opts, BlockDriverState *in_bs, + BlockMeasureInfo *info, Error **errp); =20 int coroutine_fn (*bdrv_co_pwritev_compressed)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov); diff --git a/block.c b/block.c index 6e906ec..a191b82 100644 --- a/block.c +++ b/block.c @@ -3266,6 +3266,41 @@ int64_t bdrv_get_allocated_file_size(BlockDriverStat= e *bs) return -ENOTSUP; } =20 +/* + * bdrv_measure: + * @drv: Format driver + * @opts: Creation options for new image + * @in_bs: Existing image containing data for new image (may be NULL) + * @info: Result object + * @errp: Error object + * + * Calculate file size required to create a new image. + * + * If @in_bs is given then space for allocated clusters and zero clusters + * from that image are included in the calculation. If @opts contains a + * backing file that is shared by @in_bs then backing clusters are omitted + * from the calculation. + * + * If @in_bs is NULL then the calculation includes no allocated clusters + * unless a preallocation option is given in @opts. + * + * Note that @in_bs may use a different BlockDriver from @drv. + * + * If an error occurs the @errp pointer is set. + */ +void bdrv_measure(BlockDriver *drv, QemuOpts *opts, + BlockDriverState *in_bs, BlockMeasureInfo *info, + Error **errp) +{ + if (!drv->bdrv_measure) { + error_setg(errp, "Block driver '%s' does not support size measurem= ent", + drv->format_name); + return; + } + + drv->bdrv_measure(opts, in_bs, info, errp); +} + /** * Return number of sectors on success, -errno on error. */ --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149018574439926.978153988239455; Wed, 22 Mar 2017 05:29:04 -0700 (PDT) Received: from localhost ([::1]:50747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfNu-0001Pv-La for importer@patchew.org; Wed, 22 Mar 2017 08:29:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfMq-0000jS-UY for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:27:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfMn-0003wK-S0 for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:27:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53284) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfMn-0003w8-MW for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:27:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 371A261B84; Wed, 22 Mar 2017 12:27:53 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BDC01799E; Wed, 22 Mar 2017 12:27:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 371A261B84 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 371A261B84 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:02 +0000 Message-Id: <20170322111608.31230-3-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 22 Mar 2017 12:27:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/8] raw-format: add bdrv_measure() support 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" Maximum size calculation is trivial for the raw format: it's just the requested image size (because there is no metadata). Signed-off-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia --- block/raw-format.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/block/raw-format.c b/block/raw-format.c index 86fbc65..e66ba00 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -312,6 +312,27 @@ static int64_t raw_getlength(BlockDriverState *bs) return s->size; } =20 +static void raw_measure(QemuOpts *opts, BlockDriverState *in_bs, + BlockMeasureInfo *info, + Error **errp) +{ + if (in_bs) { + int64_t ssize =3D bdrv_getlength(in_bs); + if (ssize < 0) { + error_setg_errno(errp, -ssize, "Unable to get image size"); + return; + } + info->required =3D ssize; + } else { + info->required =3D + ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0), + BDRV_SECTOR_SIZE); + } + + /* Unallocated sectors count towards the file size in raw images */ + info->fully_allocated =3D info->required; +} + static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { return bdrv_get_info(bs->file->bs, bdi); @@ -477,6 +498,7 @@ BlockDriver bdrv_raw =3D { .bdrv_truncate =3D &raw_truncate, .bdrv_getlength =3D &raw_getlength, .has_variable_length =3D true, + .bdrv_measure =3D &raw_measure, .bdrv_get_info =3D &raw_get_info, .bdrv_refresh_limits =3D &raw_refresh_limits, .bdrv_probe_blocksizes =3D &raw_probe_blocksizes, --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490185856500395.93726251493456; Wed, 22 Mar 2017 05:30:56 -0700 (PDT) Received: from localhost ([::1]:50758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfPj-0002xL-57 for importer@patchew.org; Wed, 22 Mar 2017 08:30:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfMz-0000mF-0B for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfMu-0003ws-PG for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfMu-0003wh-GT for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F75881253; Wed, 22 Mar 2017 12:27:58 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78A4A60466; Wed, 22 Mar 2017 12:27:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5F75881253 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5F75881253 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:03 +0000 Message-Id: <20170322111608.31230-4-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 22 Mar 2017 12:27:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/8] qcow2: extract preallocation calculation function 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" Calculating the preallocated image size will be needed to implement .bdrv_measure(). Extract the code out into a separate function. Signed-off-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia --- block/qcow2.c | 134 +++++++++++++++++++++++++++++++++---------------------= ---- 1 file changed, 76 insertions(+), 58 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 6a92d2e..7c702f4 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2095,6 +2095,79 @@ static int preallocate(BlockDriverState *bs) return 0; } =20 +/** + * qcow2_calc_prealloc_size: + * @total_size: virtual disk size in bytes + * @cluster_size: cluster size in bytes + * @refcount_order: refcount bits power-of-2 exponent + * + * Returns: Total number of bytes required for the fully allocated image + * (including metadata). + */ +static int64_t qcow2_calc_prealloc_size(int64_t total_size, + size_t cluster_size, + int refcount_order) +{ + /* Note: The following calculation does not need to be exact; if it is= a + * bit off, either some bytes will be "leaked" (which is fine) or we + * will need to increase the file size by some bytes (which is fine, + * too, as long as the bulk is allocated here). Therefore, using + * floating point arithmetic is fine. */ + int64_t meta_size =3D 0; + uint64_t nreftablee, nrefblocke, nl1e, nl2e; + int64_t aligned_total_size =3D align_offset(total_size, cluster_size); + int cluster_bits =3D ctz32(cluster_size); + int refblock_bits, refblock_size; + /* refcount entry size in bytes */ + double rces =3D (1 << refcount_order) / 8.; + + /* see qcow2_open() */ + refblock_bits =3D cluster_bits - (refcount_order - 3); + refblock_size =3D 1 << refblock_bits; + + /* header: 1 cluster */ + meta_size +=3D cluster_size; + + /* total size of L2 tables */ + nl2e =3D aligned_total_size / cluster_size; + nl2e =3D align_offset(nl2e, cluster_size / sizeof(uint64_t)); + meta_size +=3D nl2e * sizeof(uint64_t); + + /* total size of L1 tables */ + nl1e =3D nl2e * sizeof(uint64_t) / cluster_size; + nl1e =3D align_offset(nl1e, cluster_size / sizeof(uint64_t)); + meta_size +=3D nl1e * sizeof(uint64_t); + + /* total size of refcount blocks + * + * note: every host cluster is reference-counted, including metadata + * (even refcount blocks are recursively included). + * Let: + * a =3D total_size (this is the guest disk size) + * m =3D meta size not including refcount blocks and refcount tables + * c =3D cluster size + * y1 =3D number of refcount blocks entries + * y2 =3D meta size including everything + * rces =3D refcount entry size in bytes + * then, + * y1 =3D (y2 + a)/c + * y2 =3D y1 * rces + y1 * rces * sizeof(u64) / c + m + * we can get y1: + * y1 =3D (a + m) / (c - rces - rces * sizeof(u64) / c) + */ + nrefblocke =3D (aligned_total_size + meta_size + cluster_size) + / (cluster_size - rces - rces * sizeof(uint64_t) + / cluster_size); + meta_size +=3D DIV_ROUND_UP(nrefblocke, refblock_size) * cluster_size; + + /* total size of refcount tables */ + nreftablee =3D nrefblocke / refblock_size; + nreftablee =3D align_offset(nreftablee, cluster_size / sizeof(uint64_t= )); + meta_size +=3D nreftablee * sizeof(uint64_t); + + return meta_size + aligned_total_size; +} + static int qcow2_create2(const char *filename, int64_t total_size, const char *backing_file, const char *backing_for= mat, int flags, size_t cluster_size, PreallocMode prea= lloc, @@ -2133,64 +2206,9 @@ static int qcow2_create2(const char *filename, int64= _t total_size, int ret; =20 if (prealloc =3D=3D PREALLOC_MODE_FULL || prealloc =3D=3D PREALLOC_MOD= E_FALLOC) { - /* Note: The following calculation does not need to be exact; if i= t is a - * bit off, either some bytes will be "leaked" (which is fine) or = we - * will need to increase the file size by some bytes (which is fin= e, - * too, as long as the bulk is allocated here). Therefore, using - * floating point arithmetic is fine. */ - int64_t meta_size =3D 0; - uint64_t nreftablee, nrefblocke, nl1e, nl2e; - int64_t aligned_total_size =3D align_offset(total_size, cluster_si= ze); - int refblock_bits, refblock_size; - /* refcount entry size in bytes */ - double rces =3D (1 << refcount_order) / 8.; - - /* see qcow2_open() */ - refblock_bits =3D cluster_bits - (refcount_order - 3); - refblock_size =3D 1 << refblock_bits; - - /* header: 1 cluster */ - meta_size +=3D cluster_size; - - /* total size of L2 tables */ - nl2e =3D aligned_total_size / cluster_size; - nl2e =3D align_offset(nl2e, cluster_size / sizeof(uint64_t)); - meta_size +=3D nl2e * sizeof(uint64_t); - - /* total size of L1 tables */ - nl1e =3D nl2e * sizeof(uint64_t) / cluster_size; - nl1e =3D align_offset(nl1e, cluster_size / sizeof(uint64_t)); - meta_size +=3D nl1e * sizeof(uint64_t); - - /* total size of refcount blocks - * - * note: every host cluster is reference-counted, including metada= ta - * (even refcount blocks are recursively included). - * Let: - * a =3D total_size (this is the guest disk size) - * m =3D meta size not including refcount blocks and refcount ta= bles - * c =3D cluster size - * y1 =3D number of refcount blocks entries - * y2 =3D meta size including everything - * rces =3D refcount entry size in bytes - * then, - * y1 =3D (y2 + a)/c - * y2 =3D y1 * rces + y1 * rces * sizeof(u64) / c + m - * we can get y1: - * y1 =3D (a + m) / (c - rces - rces * sizeof(u64) / c) - */ - nrefblocke =3D (aligned_total_size + meta_size + cluster_size) - / (cluster_size - rces - rces * sizeof(uint64_t) - / cluster_size); - meta_size +=3D DIV_ROUND_UP(nrefblocke, refblock_size) * cluster_s= ize; - - /* total size of refcount tables */ - nreftablee =3D nrefblocke / refblock_size; - nreftablee =3D align_offset(nreftablee, cluster_size / sizeof(uint= 64_t)); - meta_size +=3D nreftablee * sizeof(uint64_t); - - qemu_opt_set_number(opts, BLOCK_OPT_SIZE, - aligned_total_size + meta_size, &error_abort); + int64_t prealloc_size =3D + qcow2_calc_prealloc_size(total_size, cluster_size, refcount_or= der); + qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_ab= ort); qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_lookup[preallo= c], &error_abort); } --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490185769384573.7426738401331; Wed, 22 Mar 2017 05:29:29 -0700 (PDT) Received: from localhost ([::1]:50748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfOJ-0001kU-N5 for importer@patchew.org; Wed, 22 Mar 2017 08:29:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfN2-0000pT-8a for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfMz-0003yK-3f for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfMy-0003xS-Qn for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ACAFCC04BD4C; Wed, 22 Mar 2017 12:28:02 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D2B560466; Wed, 22 Mar 2017 12:28:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ACAFCC04BD4C Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ACAFCC04BD4C From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:04 +0000 Message-Id: <20170322111608.31230-5-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 22 Mar 2017 12:28:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 4/8] qcow2: extract image creation option parsing 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" The image creation options parsed by qcow2_create() are also needed to implement .bdrv_measure(). Extract the parsing code, including input validation. Signed-off-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia --- block/qcow2.c | 109 +++++++++++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 73 insertions(+), 36 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7c702f4..19be468 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2168,24 +2168,73 @@ static int64_t qcow2_calc_prealloc_size(int64_t tot= al_size, return meta_size + aligned_total_size; } =20 -static int qcow2_create2(const char *filename, int64_t total_size, - const char *backing_file, const char *backing_for= mat, - int flags, size_t cluster_size, PreallocMode prea= lloc, - QemuOpts *opts, int version, int refcount_order, - Error **errp) +static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp) { + size_t cluster_size; int cluster_bits; - QDict *options; =20 - /* Calculate cluster_bits */ + cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, + DEFAULT_CLUSTER_SIZE); cluster_bits =3D ctz32(cluster_size); if (cluster_bits < MIN_CLUSTER_BITS || cluster_bits > MAX_CLUSTER_BITS= || (1 << cluster_bits) !=3D cluster_size) { error_setg(errp, "Cluster size must be a power of two between %d a= nd " "%dk", 1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - = 10)); - return -EINVAL; + return 0; } + return cluster_size; +} + +static int qcow2_opt_get_version_del(QemuOpts *opts, Error **errp) +{ + char *buf; + int ret; + + buf =3D qemu_opt_get_del(opts, BLOCK_OPT_COMPAT_LEVEL); + if (!buf) { + ret =3D 3; /* default */ + } else if (!strcmp(buf, "0.10")) { + ret =3D 2; + } else if (!strcmp(buf, "1.1")) { + ret =3D 3; + } else { + error_setg(errp, "Invalid compatibility level: '%s'", buf); + ret =3D -EINVAL; + } + g_free(buf); + return ret; +} + +static uint64_t qcow2_opt_get_refcount_bits_del(QemuOpts *opts, int versio= n, + Error **errp) +{ + uint64_t refcount_bits; + + refcount_bits =3D qemu_opt_get_number_del(opts, BLOCK_OPT_REFCOUNT_BIT= S, 16); + if (refcount_bits > 64 || !is_power_of_2(refcount_bits)) { + error_setg(errp, "Refcount width must be a power of two and may no= t " + "exceed 64 bits"); + return 0; + } + + if (version < 3 && refcount_bits !=3D 16) { + error_setg(errp, "Different refcount widths than 16 bits require " + "compatibility level 1.1 or above (use compat=3D1.1 or " + "greater)"); + return 0; + } + + return refcount_bits; +} + +static int qcow2_create2(const char *filename, int64_t total_size, + const char *backing_file, const char *backing_for= mat, + int flags, size_t cluster_size, PreallocMode prea= lloc, + QemuOpts *opts, int version, int refcount_order, + Error **errp) +{ + QDict *options; =20 /* * Open the image file and write a minimal qcow2 header. @@ -2235,7 +2284,7 @@ static int qcow2_create2(const char *filename, int64_= t total_size, *header =3D (QCowHeader) { .magic =3D cpu_to_be32(QCOW_MAGIC), .version =3D cpu_to_be32(version), - .cluster_bits =3D cpu_to_be32(cluster_bits), + .cluster_bits =3D cpu_to_be32(ctz32(cluster_size)), .size =3D cpu_to_be64(0), .l1_table_offset =3D cpu_to_be64(0), .l1_size =3D cpu_to_be32(0), @@ -2371,8 +2420,8 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) int flags =3D 0; size_t cluster_size =3D DEFAULT_CLUSTER_SIZE; PreallocMode prealloc; - int version =3D 3; - uint64_t refcount_bits =3D 16; + int version; + uint64_t refcount_bits; int refcount_order; Error *local_err =3D NULL; int ret; @@ -2385,8 +2434,12 @@ static int qcow2_create(const char *filename, QemuOp= ts *opts, Error **errp) if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) { flags |=3D BLOCK_FLAG_ENCRYPT; } - cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, - DEFAULT_CLUSTER_SIZE); + cluster_size =3D qcow2_opt_get_cluster_size_del(opts, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto finish; + } buf =3D qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); prealloc =3D qapi_enum_parse(PreallocMode_lookup, buf, PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, @@ -2396,16 +2449,10 @@ static int qcow2_create(const char *filename, QemuO= pts *opts, Error **errp) ret =3D -EINVAL; goto finish; } - g_free(buf); - buf =3D qemu_opt_get_del(opts, BLOCK_OPT_COMPAT_LEVEL); - if (!buf) { - /* keep the default */ - } else if (!strcmp(buf, "0.10")) { - version =3D 2; - } else if (!strcmp(buf, "1.1")) { - version =3D 3; - } else { - error_setg(errp, "Invalid compatibility level: '%s'", buf); + + version =3D qcow2_opt_get_version_del(opts, &local_err); + if (local_err) { + error_propagate(errp, local_err); ret =3D -EINVAL; goto finish; } @@ -2428,19 +2475,9 @@ static int qcow2_create(const char *filename, QemuOp= ts *opts, Error **errp) goto finish; } =20 - refcount_bits =3D qemu_opt_get_number_del(opts, BLOCK_OPT_REFCOUNT_BIT= S, - refcount_bits); - if (refcount_bits > 64 || !is_power_of_2(refcount_bits)) { - error_setg(errp, "Refcount width must be a power of two and may no= t " - "exceed 64 bits"); - ret =3D -EINVAL; - goto finish; - } - - if (version < 3 && refcount_bits !=3D 16) { - error_setg(errp, "Different refcount widths than 16 bits require " - "compatibility level 1.1 or above (use compat=3D1.1 or " - "greater)"); + refcount_bits =3D qcow2_opt_get_refcount_bits_del(opts, version, &loca= l_err); + if (local_err) { + error_propagate(errp, local_err); ret =3D -EINVAL; goto finish; } --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490185776098940.0230059626614; Wed, 22 Mar 2017 05:29:36 -0700 (PDT) Received: from localhost ([::1]:50749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfOQ-0001py-N5 for importer@patchew.org; Wed, 22 Mar 2017 08:29:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfN7-0000wj-KV for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfN4-00040w-Ut for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37886) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfN4-00040r-MS for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B19B085542; Wed, 22 Mar 2017 12:28:10 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 079E35C88E; Wed, 22 Mar 2017 12:28:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B19B085542 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B19B085542 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:05 +0000 Message-Id: <20170322111608.31230-6-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 22 Mar 2017 12:28:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/8] qcow2: add bdrv_measure() support 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" Use qcow2_calc_prealloc_size() to get the required file size. Signed-off-by: Stefan Hajnoczi --- block/qcow2.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 119 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 19be468..ed898d3 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2940,6 +2940,124 @@ static coroutine_fn int qcow2_co_flush_to_os(BlockD= riverState *bs) return 0; } =20 +static void qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs, + BlockMeasureInfo *info, Error **errp) +{ + Error *local_err =3D NULL; + uint64_t required =3D 0; /* bytes that contribute to required size */ + uint64_t virtual_size; /* disk size as seen by guest */ + uint64_t refcount_bits; + size_t cluster_size; + int version; + char *optstr; + PreallocMode prealloc; + bool has_backing_file; + + /* Parse image creation options */ + cluster_size =3D qcow2_opt_get_cluster_size_del(opts, &local_err); + if (local_err) { + goto err; + } + + version =3D qcow2_opt_get_version_del(opts, &local_err); + if (local_err) { + goto err; + } + + refcount_bits =3D qcow2_opt_get_refcount_bits_del(opts, version, &loca= l_err); + if (local_err) { + goto err; + } + + optstr =3D qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); + prealloc =3D qapi_enum_parse(PreallocMode_lookup, optstr, + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, + &local_err); + g_free(optstr); + if (local_err) { + goto err; + } + + optstr =3D qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE); + has_backing_file =3D !!optstr; + g_free(optstr); + + virtual_size =3D align_offset(qemu_opt_get_size_del(opts, BLOCK_OPT_SI= ZE, 0), + cluster_size); + + /* Account for input image */ + if (in_bs) { + int64_t ssize =3D bdrv_getlength(in_bs); + if (ssize < 0) { + error_setg_errno(errp, -ssize, "Unable to get image virtual_si= ze"); + return; + } + + virtual_size =3D align_offset(ssize, cluster_size); + + if (has_backing_file) { + /* We don't how much of the backing chain is shared by the inp= ut + * image and the new image file. In the worst case the new im= age's + * backing file has nothing in common with the input image. Be + * conservative and assume all clusters need to be written. + */ + required =3D virtual_size; + } else { + int cluster_sectors =3D cluster_size / BDRV_SECTOR_SIZE; + int64_t sector_num; + int pnum =3D 0; + + for (sector_num =3D 0; + sector_num < ssize / BDRV_SECTOR_SIZE; + sector_num +=3D pnum) { + int nb_sectors =3D MAX(ssize / BDRV_SECTOR_SIZE - sector_n= um, + INT_MAX); + BlockDriverState *file; + int64_t ret; + + ret =3D bdrv_get_block_status_above(in_bs, NULL, + sector_num, nb_sectors, + &pnum, &file); + if (ret < 0) { + error_setg_errno(errp, -ret, "Unable to get block stat= us"); + return; + } + + if (ret & BDRV_BLOCK_ZERO) { + /* Skip zero regions (safe with no backing file) */ + } else if ((ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED)= ) =3D=3D + (BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED)) { + /* Extend pnum to end of cluster for next iteration */ + pnum =3D ROUND_UP(sector_num + pnum, cluster_sectors) - + sector_num; + + /* Count clusters we've seen */ + required +=3D (sector_num % cluster_sectors + pnum) * + BDRV_SECTOR_SIZE; + } + } + } + } + + /* Take into account preallocation. Nothing special is needed for + * PREALLOC_MODE_METADATA since metadata is always counted. + */ + if (prealloc =3D=3D PREALLOC_MODE_FULL || prealloc =3D=3D PREALLOC_MOD= E_FALLOC) { + required =3D virtual_size; + } + + info->fully_allocated =3D + qcow2_calc_prealloc_size(virtual_size, cluster_size, + ctz32(refcount_bits)); + + /* Remove regions that are not required */ + info->required =3D info->fully_allocated - virtual_size + required; + return; + +err: + error_propagate(errp, local_err); +} + static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVQcow2State *s =3D bs->opaque; @@ -3487,6 +3605,7 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_snapshot_delete =3D qcow2_snapshot_delete, .bdrv_snapshot_list =3D qcow2_snapshot_list, .bdrv_snapshot_load_tmp =3D qcow2_snapshot_load_tmp, + .bdrv_measure =3D qcow2_measure, .bdrv_get_info =3D qcow2_get_info, .bdrv_get_specific_info =3D qcow2_get_specific_info, =20 --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490185887093667.9441904140684; Wed, 22 Mar 2017 05:31:27 -0700 (PDT) Received: from localhost ([::1]:50759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfQD-0003IR-Gr for importer@patchew.org; Wed, 22 Mar 2017 08:31:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfNP-0001B1-5S for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfNM-00048e-0h for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfNL-00048X-Nj for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C037663322; Wed, 22 Mar 2017 12:28:27 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id A65A47F424; Wed, 22 Mar 2017 12:28:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C037663322 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C037663322 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:06 +0000 Message-Id: <20170322111608.31230-7-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 22 Mar 2017 12:28:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 6/8] qemu-img: add measure subcommand 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" The measure subcommand calculates the size required by a new image file. This can be used by users or management tools that need to allocate space on an LVM volume, SAN LUN, etc before creating or converting an image file. Suggested-by: Maor Lipchuk Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ qemu-img-cmds.hx | 6 ++ qemu-img.texi | 25 ++++++ 3 files changed, 258 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 98b836b..eb1fb62 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -59,6 +59,7 @@ enum { OPTION_PATTERN =3D 260, OPTION_FLUSH_INTERVAL =3D 261, OPTION_NO_DRAIN =3D 262, + OPTION_SIZE =3D 263, }; =20 typedef enum OutputFormat { @@ -4287,6 +4288,232 @@ out: return 0; } =20 +static void dump_json_block_measure_info(BlockMeasureInfo *info) +{ + QString *str; + QObject *obj; + Visitor *v =3D qobject_output_visitor_new(&obj); + + visit_type_BlockMeasureInfo(v, NULL, &info, &error_abort); + visit_complete(v, &obj); + str =3D qobject_to_json_pretty(obj); + assert(str !=3D NULL); + printf("%s\n", qstring_get_str(str)); + qobject_decref(obj); + visit_free(v); + QDECREF(str); +} + +static int img_measure(int argc, char **argv) +{ + static const struct option long_options[] =3D { + {"help", no_argument, 0, 'h'}, + {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"object", required_argument, 0, OPTION_OBJECT}, + {"output", required_argument, 0, OPTION_OUTPUT}, + {"size", required_argument, 0, OPTION_SIZE}, + {0, 0, 0, 0} + }; + OutputFormat output_format =3D OFORMAT_HUMAN; + BlockBackend *in_blk =3D NULL; + BlockDriver *drv; + const char *filename =3D NULL; + const char *fmt =3D NULL; + const char *out_fmt =3D "raw"; + char *options =3D NULL; + char *snapshot_name =3D NULL; + QemuOpts *opts =3D NULL; + QemuOpts *object_opts =3D NULL; + QemuOpts *sn_opts =3D NULL; + QemuOptsList *create_opts =3D NULL; + bool image_opts =3D false; + uint64_t img_size =3D ~0ULL; + BlockMeasureInfo info; + Error *local_err =3D NULL; + int ret =3D 1; + int c; + + while ((c =3D getopt_long(argc, argv, "hf:O:o:l:", + long_options, NULL)) !=3D -1) { + switch (c) { + case '?': + case 'h': + help(); + break; + case 'f': + fmt =3D optarg; + break; + case 'O': + out_fmt =3D optarg; + break; + case 'o': + if (!is_valid_option_list(optarg)) { + error_report("Invalid option list: %s", optarg); + goto out; + } + if (!options) { + options =3D g_strdup(optarg); + } else { + char *old_options =3D options; + options =3D g_strdup_printf("%s,%s", options, optarg); + g_free(old_options); + } + break; + case 'l': + if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) { + sn_opts =3D qemu_opts_parse_noisily(&internal_snapshot_opt= s, + optarg, false); + if (!sn_opts) { + error_report("Failed in parsing snapshot param '%s'", + optarg); + goto out; + } + } else { + snapshot_name =3D optarg; + } + break; + case OPTION_OBJECT: + object_opts =3D qemu_opts_parse_noisily(&qemu_object_opts, + optarg, true); + if (!object_opts) { + goto out; + } + break; + case OPTION_IMAGE_OPTS: + image_opts =3D true; + break; + case OPTION_OUTPUT: + if (!strcmp(optarg, "json")) { + output_format =3D OFORMAT_JSON; + } else if (!strcmp(optarg, "human")) { + output_format =3D OFORMAT_HUMAN; + } else { + error_report("--output must be used with human or json " + "as argument."); + goto out; + } + break; + case OPTION_SIZE: + { + int64_t sval; + + sval =3D cvtnum(optarg); + if (sval < 0) { + if (sval =3D=3D -ERANGE) { + error_report("Image size must be less than 8 EiB!"); + } else { + error_report("Invalid image size specified! You may us= e " + "k, M, G, T, P or E suffixes for "); + error_report("kilobytes, megabytes, gigabytes, terabyt= es, " + "petabytes and exabytes."); + } + goto out; + } + img_size =3D (uint64_t)sval; + } + break; + } + } + + if (qemu_opts_foreach(&qemu_object_opts, + user_creatable_add_opts_foreach, + NULL, NULL)) { + goto out; + } + + if (argc - optind > 1) { + error_report("At most one filename argument is allowed."); + goto out; + } else if (argc - optind =3D=3D 1) { + filename =3D argv[optind]; + } + + if (!filename && + (object_opts || image_opts || fmt || snapshot_name || sn_opts)) { + error_report("--object, --image-opts, -f, and -l " + "require a filename argument."); + goto out; + } + if (filename && img_size !=3D ~0ULL) { + error_report("--size N cannot be used together with a filename."); + goto out; + } + if (!filename && img_size =3D=3D ~0ULL) { + error_report("Either --size N or one filename must be specified."); + goto out; + } + + if (filename) { + in_blk =3D img_open(image_opts, filename, fmt, 0, false, false); + if (!in_blk) { + goto out; + } + + if (sn_opts) { + bdrv_snapshot_load_tmp(blk_bs(in_blk), + qemu_opt_get(sn_opts, SNAPSHOT_OPT_ID), + qemu_opt_get(sn_opts, SNAPSHOT_OPT_NAME), + &local_err); + } else if (snapshot_name !=3D NULL) { + bdrv_snapshot_load_tmp_by_id_or_name(blk_bs(in_blk), + snapshot_name, &local_err); + } + if (local_err) { + error_reportf_err(local_err, "Failed to load snapshot: "); + goto out; + } + } + + drv =3D bdrv_find_format(out_fmt); + if (!drv) { + error_report("Unknown file format '%s'", out_fmt); + goto out; + } + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation", + drv->format_name); + goto out; + } + + create_opts =3D qemu_opts_append(create_opts, drv->create_opts); + create_opts =3D qemu_opts_append(create_opts, bdrv_file.create_opts); + opts =3D qemu_opts_create(create_opts, NULL, 0, &error_abort); + if (options) { + qemu_opts_do_parse(opts, options, NULL, &local_err); + if (local_err) { + error_report_err(local_err); + error_report("Invalid options for file format '%s'", out_fmt); + goto out; + } + } + if (img_size !=3D ~0ULL) { + qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort); + } + + bdrv_measure(drv, opts, in_blk ? blk_bs(in_blk) : NULL, &info, &local_= err); + if (local_err) { + error_report_err(local_err); + goto out; + } + + if (output_format =3D=3D OFORMAT_HUMAN) { + printf("required size: %" PRIu64 "\n", info.required); + printf("fully allocated size: %" PRIu64 "\n", info.fully_allocated= ); + } else { + dump_json_block_measure_info(&info); + } + + ret =3D 0; + +out: + qemu_opts_del(object_opts); + qemu_opts_del(opts); + qemu_opts_del(sn_opts); + qemu_opts_free(create_opts); + g_free(options); + blk_unref(in_blk); + return ret; +} =20 static const img_cmd_t img_cmds[] =3D { #define DEF(option, callback, arg_string) \ diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 9c9702c..291bc2c 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -63,6 +63,12 @@ STEXI @item map [--object @var{objectdef}] [--image-opts] [-f @var{fmt}] [--outp= ut=3D@var{ofmt}] @var{filename} ETEXI =20 +DEF("measure", img_measure, +"measure [--output=3Dofmt] [-O output_fmt] [-o options] [--size N | [--obj= ect objectdef] [--image-opts] [-f fmt] [-l snapshot_param] filename]") +STEXI +@item measure [--output=3D@var{ofmt}] [-O @var{output_fmt}] [-o @var{optio= ns}] [--size @var{N} | [--object @var{objectdef}] [--image-opts] [-f @var{f= mt}] [-l @var{snapshot_param}] @var{filename}] +ETEXI + DEF("snapshot", img_snapshot, "snapshot [--object objectdef] [--image-opts] [-q] [-l | -a snapshot |= -c snapshot | -d snapshot] filename") STEXI diff --git a/qemu-img.texi b/qemu-img.texi index c81db3e..030b074 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -429,6 +429,31 @@ preallocated. For more information, consult @file{include/block/block.h} in QEMU's source code. =20 +@item measure [--output=3D@var{ofmt}] [-O @var{output_fmt}] [-o @var{optio= ns}] [--size @var{N} | [--object @var{objectdef}] [--image-opts] [-f @var{f= mt}] [-l @var{snapshot_param}] @var{filename}] + +Calculate the file size required for a new image. This information can be= used +to size logical volumes or SAN LUNs appropriately for the image that will = be +placed in them. The values reported are guaranteed to be large enough to = fit +the image. + +If the size @var{N} is given then act as if creating a new empty image file +using @command{qemu-img create}. If @var{filename} is given then act as if +converting an existing image file using @command{qemu-img convert}. + +The following fields are reported: +@example +required size: 524288 +fully allocated size: 1074069504 +@end example + +The @code{required size} is the file size of the new image. It may be sma= ller +than the virtual disk size if the image format supports compact representa= tion. + +The @code{fully allocated size} is the file size of the new image once dat= a has +been written to all sectors. This is the maximum size that the image file= can +occupy with the exception of internal snapshots, dirty bitmaps, vmstate da= ta, +and other advanced image format features. + @item snapshot [-l | -a @var{snapshot} | -c @var{snapshot} | -d @var{snaps= hot} ] @var{filename} =20 List, apply, create or delete snapshots in image @var{filename}. --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149018597607619.678387435272498; Wed, 22 Mar 2017 05:32:56 -0700 (PDT) Received: from localhost ([::1]:50765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfRe-0004R1-UA for importer@patchew.org; Wed, 22 Mar 2017 08:32:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfNS-0001Dz-Qx for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfNS-0004BR-0P for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38448) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfNR-0004Ao-Qq for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D873E4DD5F; Wed, 22 Mar 2017 12:28:33 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1440118205; Wed, 22 Mar 2017 12:28:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D873E4DD5F Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D873E4DD5F From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:07 +0000 Message-Id: <20170322111608.31230-8-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 22 Mar 2017 12:28:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 7/8] qemu-iotests: support per-format golden output files 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" Some tests produce format-dependent output. Either the difference is filtered out and ignored, or the test case is format-specific so we don't need to worry about per-format output differences. There is a third case: the test script is the same for all image formats and the format-dependent output is relevant. An ugly workaround is to copy-paste the test into multiple per-format test cases. This duplicates code and is not maintainable. This patch allows test cases to add per-format golden output files so a single test case can work correctly when format-dependent output must be checked: 123.out.qcow2 123.out.raw 123.out.vmdk ... This naming scheme is not composable with 123.out.nocache or 123.pc.out, two other scenarios where output files are split. I don't think it matters since few test cases need these features. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/check | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 4b1c674..29553cf 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -338,6 +338,11 @@ do reference=3D"$reference_machine" fi =20 + reference_format=3D"$source_iotests/$seq.out.$IMGFMT" + if [ -f "$reference_format" ]; then + reference=3D"$reference_format" + fi + if [ "$CACHEMODE" =3D "none" ]; then [ -f "$source_iotests/$seq.out.nocache" ] && reference=3D"= $source_iotests/$seq.out.nocache" fi --=20 2.9.3 From nobody Tue Apr 30 21:35:51 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490186088287892.3455722661008; Wed, 22 Mar 2017 05:34:48 -0700 (PDT) Received: from localhost ([::1]:50771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfTS-0005Tx-CX for importer@patchew.org; Wed, 22 Mar 2017 08:34:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqfNc-0001Lv-HY for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqfNZ-0004I1-91 for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqfNY-0004Hi-VL for qemu-devel@nongnu.org; Wed, 22 Mar 2017 08:28:41 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0640C4AEAF; Wed, 22 Mar 2017 12:28:41 +0000 (UTC) Received: from localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 426FB7D85F; Wed, 22 Mar 2017 12:28:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0640C4AEAF Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0640C4AEAF From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 22 Mar 2017 11:16:08 +0000 Message-Id: <20170322111608.31230-9-stefanha@redhat.com> In-Reply-To: <20170322111608.31230-1-stefanha@redhat.com> References: <20170322111608.31230-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 22 Mar 2017 12:28:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 8/8] iotests: add test 178 for qemu-img measure 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 , John Snow , Nir Soffer , Maor Lipchuk , Stefan Hajnoczi , Alberto Garcia 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" Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/178 | 144 +++++++++++++++++++++++ tests/qemu-iotests/178.out.qcow2 | 242 +++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/178.out.raw | 130 +++++++++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 517 insertions(+) create mode 100755 tests/qemu-iotests/178 create mode 100644 tests/qemu-iotests/178.out.qcow2 create mode 100644 tests/qemu-iotests/178.out.raw diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 new file mode 100755 index 0000000..b777870 --- /dev/null +++ b/tests/qemu-iotests/178 @@ -0,0 +1,144 @@ +#!/bin/bash +# +# qemu-img measure sub-command tests +# +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=3Dstefanha@redhat.com + +seq=3D`basename $0` +echo "QA output created by $seq" + +here=3D`pwd` +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.pattern + +_supported_fmt raw qcow2 +_supported_proto file +_supported_os Linux + +echo "=3D=3D Input validation =3D=3D" +echo + +_make_test_img 1G + +$QEMU_IMG measure # missing arguments +$QEMU_IMG measure --size 2G "$TEST_IMG" # only one allowed +$QEMU_IMG measure "$TEST_IMG" a # only one filename allowed +$QEMU_IMG measure --object secret,id=3Dsec0,data=3DMTIzNDU2,format=3Dbase6= 4 # missing filename +$QEMU_IMG measure --image-opts # missing filename +$QEMU_IMG measure -f qcow2 # missing filename +$QEMU_IMG measure -l snap1 # missing filename +$QEMU_IMG measure -o , # invalid option list +$QEMU_IMG measure -l snapshot.foo # invalid snapshot option +$QEMU_IMG measure --output foo # invalid output format +$QEMU_IMG measure --size -1 # invalid image size +$QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format + +make_test_img_with_fmt() { + # Shadow global variables within this function + local IMGFMT=3D"$1" IMGOPTS=3D"" + _make_test_img "$2" +} + +qemu_io_with_fmt() { + # Shadow global variables within this function + local QEMU_IO_OPTIONS=3D$(echo "$QEMU_IO_OPTIONS" | sed "s/-f $IMGFMT/= -f $1/") + shift + $QEMU_IO "$@" +} + +for ofmt in human json; do + echo + echo "=3D=3D Size calculation for a new file ($ofmt) =3D=3D" + echo + + # Try a few interesting sizes + $QEMU_IMG measure --output=3D$ofmt -O "$IMGFMT" --size 0 + $QEMU_IMG measure --output=3D$ofmt -O "$IMGFMT" --size 2G + $QEMU_IMG measure --output=3D$ofmt -O "$IMGFMT" --size 64G + $QEMU_IMG measure --output=3D$ofmt -O "$IMGFMT" --size 256G + $QEMU_IMG measure --output=3D$ofmt -O "$IMGFMT" --size 1T + + # Always test the raw input files but also IMGFMT + for fmt in $(echo -e "raw\n$IMGFMT\n" | sort -u); do + echo + echo "=3D=3D Empty $fmt input image ($ofmt) =3D=3D" + echo + make_test_img_with_fmt "$fmt" 0 + $QEMU_IMG measure --output=3D$ofmt -f "$fmt" -O "$IMGFMT" "$TEST_I= MG" + + echo + echo "=3D=3D $fmt input image with data ($ofmt) =3D=3D" + echo + make_test_img_with_fmt "$fmt" 1G + $QEMU_IMG measure --output=3D$ofmt -f "$fmt" -O "$IMGFMT" "$TEST_I= MG" + qemu_io_with_fmt "$fmt" -c "write 512 512" "$TEST_IMG" | _filter_q= emu_io + qemu_io_with_fmt "$fmt" -c "write 64K 64K" "$TEST_IMG" | _filter_q= emu_io + if [ "$fmt" =3D "qcow2" ]; then + $QEMU_IMG snapshot -c snapshot1 "$TEST_IMG" + fi + qemu_io_with_fmt "$fmt" -c "write 128M 63K" "$TEST_IMG" | _filter_= qemu_io + $QEMU_IMG measure --output=3D$ofmt -f "$fmt" -O "$IMGFMT" "$TEST_I= MG" + + if [ "$fmt" =3D "qcow2" ]; then + echo + echo "=3D=3D $fmt input image with internal snapshot ($ofmt) = =3D=3D" + echo + $QEMU_IMG measure --output=3D$ofmt -f "$fmt" -l snapshot1 \ + -O "$IMGFMT" "$TEST_IMG" + fi + + if [ "$IMGFMT" =3D "qcow2" ]; then + echo + echo "=3D=3D $fmt input image and a backing file ($ofmt) =3D= =3D" + echo + # The backing file doesn't need to exist :) + $QEMU_IMG measure --output=3D$ofmt -o backing_file=3Dx \ + -f "$fmt" -O "$IMGFMT" "$TEST_IMG" + fi + + echo + echo "=3D=3D $fmt input image and preallocation ($ofmt) =3D=3D" + echo + $QEMU_IMG measure --output=3D$ofmt -o preallocation=3Dfull \ + -f "$fmt" -O "$IMGFMT" "$TEST_IMG" + + echo + echo "=3D=3D Fully-allocated $fmt input image ($ofmt) =3D=3D" + echo + make_test_img_with_fmt "$fmt" 8M + qemu_io_with_fmt "$fmt" -c "write 0 8M" "$TEST_IMG" | _filter_qemu= _io + $QEMU_IMG measure --output=3D$ofmt -f "$fmt" -O "$IMGFMT" "$TEST_I= MG" + done +done + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.= qcow2 new file mode 100644 index 0000000..3e217c8 --- /dev/null +++ b/tests/qemu-iotests/178.out.qcow2 @@ -0,0 +1,242 @@ +QA output created by 178 +=3D=3D Input validation =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +qemu-img: Either --size N or one filename must be specified. +qemu-img: --size N cannot be used together with a filename. +qemu-img: At most one filename argument is allowed. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: Invalid option list: , +qemu-img: Invalid parameter 'snapshot.foo' +qemu-img: Failed in parsing snapshot param 'snapshot.foo' +qemu-img: --output must be used with human or json as argument. +qemu-img: Image size must be less than 8 EiB! +qemu-img: Unknown file format 'foo' + +=3D=3D Size calculation for a new file (human) =3D=3D + +required size: 131072 +fully allocated size: 131072 +required size: 589824 +fully allocated size: 2148073472 +required size: 10747904 +fully allocated size: 68730224640 +required size: 42205184 +fully allocated size: 274920112128 +required size: 168034304 +fully allocated size: 1099679662080 + +=3D=3D Empty qcow2 input image (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D0 +required size: 131072 +fully allocated size: 131072 + +=3D=3D qcow2 input image with data (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +required size: 327680 +fully allocated size: 1074069504 +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 524288 +fully allocated size: 1074069504 + +=3D=3D qcow2 input image with internal snapshot (human) =3D=3D + +required size: 458752 +fully allocated size: 1074069504 + +=3D=3D qcow2 input image and a backing file (human) =3D=3D + +required size: 1074069504 +fully allocated size: 1074069504 + +=3D=3D qcow2 input image and preallocation (human) =3D=3D + +required size: 1074069504 +fully allocated size: 1074069504 + +=3D=3D Fully-allocated qcow2 input image (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 8650752 +fully allocated size: 8650752 + +=3D=3D Empty raw input image (human) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D0 +required size: 131072 +fully allocated size: 131072 + +=3D=3D raw input image with data (human) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D1073741824 +required size: 327680 +fully allocated size: 1074069504 +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 524288 +fully allocated size: 1074069504 + +=3D=3D raw input image and a backing file (human) =3D=3D + +required size: 1074069504 +fully allocated size: 1074069504 + +=3D=3D raw input image and preallocation (human) =3D=3D + +required size: 1074069504 +fully allocated size: 1074069504 + +=3D=3D Fully-allocated raw input image (human) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 8650752 +fully allocated size: 8650752 + +=3D=3D Size calculation for a new file (json) =3D=3D + +{ + "required": 131072, + "fully-allocated": 131072 +} +{ + "required": 589824, + "fully-allocated": 2148073472 +} +{ + "required": 10747904, + "fully-allocated": 68730224640 +} +{ + "required": 42205184, + "fully-allocated": 274920112128 +} +{ + "required": 168034304, + "fully-allocated": 1099679662080 +} + +=3D=3D Empty qcow2 input image (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D0 +{ + "required": 131072, + "fully-allocated": 131072 +} + +=3D=3D qcow2 input image with data (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +{ + "required": 327680, + "fully-allocated": 1074069504 +} +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 524288, + "fully-allocated": 1074069504 +} + +=3D=3D qcow2 input image with internal snapshot (json) =3D=3D + +{ + "required": 458752, + "fully-allocated": 1074069504 +} + +=3D=3D qcow2 input image and a backing file (json) =3D=3D + +{ + "required": 1074069504, + "fully-allocated": 1074069504 +} + +=3D=3D qcow2 input image and preallocation (json) =3D=3D + +{ + "required": 1074069504, + "fully-allocated": 1074069504 +} + +=3D=3D Fully-allocated qcow2 input image (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 8650752, + "fully-allocated": 8650752 +} + +=3D=3D Empty raw input image (json) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D0 +{ + "required": 131072, + "fully-allocated": 131072 +} + +=3D=3D raw input image with data (json) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D1073741824 +{ + "required": 327680, + "fully-allocated": 1074069504 +} +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 524288, + "fully-allocated": 1074069504 +} + +=3D=3D raw input image and a backing file (json) =3D=3D + +{ + "required": 1074069504, + "fully-allocated": 1074069504 +} + +=3D=3D raw input image and preallocation (json) =3D=3D + +{ + "required": 1074069504, + "fully-allocated": 1074069504 +} + +=3D=3D Fully-allocated raw input image (json) =3D=3D + +Formatting 'TEST_DIR/t.qcow2', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 8650752, + "fully-allocated": 8650752 +} +*** done diff --git a/tests/qemu-iotests/178.out.raw b/tests/qemu-iotests/178.out.raw new file mode 100644 index 0000000..5d75962 --- /dev/null +++ b/tests/qemu-iotests/178.out.raw @@ -0,0 +1,130 @@ +QA output created by 178 +=3D=3D Input validation =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +qemu-img: Either --size N or one filename must be specified. +qemu-img: --size N cannot be used together with a filename. +qemu-img: At most one filename argument is allowed. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: --object, --image-opts, -f, and -l require a filename argument. +qemu-img: Invalid option list: , +qemu-img: Invalid parameter 'snapshot.foo' +qemu-img: Failed in parsing snapshot param 'snapshot.foo' +qemu-img: --output must be used with human or json as argument. +qemu-img: Image size must be less than 8 EiB! +qemu-img: Unknown file format 'foo' + +=3D=3D Size calculation for a new file (human) =3D=3D + +required size: 0 +fully allocated size: 0 +required size: 2147483648 +fully allocated size: 2147483648 +required size: 68719476736 +fully allocated size: 68719476736 +required size: 274877906944 +fully allocated size: 274877906944 +required size: 1099511627776 +fully allocated size: 1099511627776 + +=3D=3D Empty raw input image (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D0 +required size: 0 +fully allocated size: 0 + +=3D=3D raw input image with data (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +required size: 1073741824 +fully allocated size: 1073741824 +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 1073741824 +fully allocated size: 1073741824 + +=3D=3D raw input image and preallocation (human) =3D=3D + +required size: 1073741824 +fully allocated size: 1073741824 + +=3D=3D Fully-allocated raw input image (human) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +required size: 8388608 +fully allocated size: 8388608 + +=3D=3D Size calculation for a new file (json) =3D=3D + +{ + "required": 0, + "fully-allocated": 0 +} +{ + "required": 2147483648, + "fully-allocated": 2147483648 +} +{ + "required": 68719476736, + "fully-allocated": 68719476736 +} +{ + "required": 274877906944, + "fully-allocated": 274877906944 +} +{ + "required": 1099511627776, + "fully-allocated": 1099511627776 +} + +=3D=3D Empty raw input image (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D0 +{ + "required": 0, + "fully-allocated": 0 +} + +=3D=3D raw input image with data (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +{ + "required": 1073741824, + "fully-allocated": 1073741824 +} +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 64512/64512 bytes at offset 134217728 +63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 1073741824, + "fully-allocated": 1073741824 +} + +=3D=3D raw input image and preallocation (json) =3D=3D + +{ + "required": 1073741824, + "fully-allocated": 1073741824 +} + +=3D=3D Fully-allocated raw input image (json) =3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D8388608 +wrote 8388608/8388608 bytes at offset 0 +8 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ + "required": 8388608, + "fully-allocated": 8388608 +} +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 1f4bf03..846f962 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -168,3 +168,4 @@ 173 rw auto 174 auto 175 auto quick +178 auto quick --=20 2.9.3