From nobody Thu May 2 12:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563187589; cv=none; d=zoho.com; s=zohoarc; b=FFL9PwUGKJ5ndN5OR5A2tkPHLn9plALmdJ7gFWFV3yTXHCPTVJKIxl51mUkvJcebw09cNKXgCMjorEKV3WGgpMNPmgfy2MXh4Bj1eQlVr9dCCs3U0gkLwLQIG16zILPmxl11cHFaCOhQsnsbYUow/otroTEUz2DPl+92xJenM2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563187589; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KBFa1koU0a5UoNLmpwM74YkXLyqhZUnZT7yddhAR3JU=; b=FCqTN+U60NL8uz/rg0/VfEqKL3CXlEcXwwswJRmJtHp3ji36kvCWVYRt3DZD1V7aNujHMxh8PFzOHoBRZ/tTHu1mlaiI2YqyIe0l1dqaf9oG4lhxASO7xZmRl7+maFVsZ74ThKfbgfSoDSmme0tQfIa6DGvI8HP7nigKb26JUTY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563187589413663.2799408902812; Mon, 15 Jul 2019 03:46:29 -0700 (PDT) Received: from localhost ([::1]:36838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyV2-0006Fk-4m for importer@patchew.org; Mon, 15 Jul 2019 06:46:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39329) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyTv-0002AU-CF for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmyTu-0001fU-9P for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34530) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmyTr-0001do-Ma; Mon, 15 Jul 2019 06:45:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B5D6307D847; Mon, 15 Jul 2019 10:45:15 +0000 (UTC) Received: from localhost (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F8014505; Mon, 15 Jul 2019 10:45:14 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Jul 2019 12:45:05 +0200 Message-Id: <20190715104508.7568-2-mreitz@redhat.com> In-Reply-To: <20190715104508.7568-1-mreitz@redhat.com> References: <20190715104508.7568-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 15 Jul 2019 10:45:15 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1? 1/4] qcow2: Fix .bdrv_has_zero_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , Stefan Weil , qemu-devel@nongnu.org, Max Reitz , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If a qcow2 file is preallocated, it can no longer guarantee that it initially appears as filled with zeroes. So implement .bdrv_has_zero_init() by checking whether the file is preallocated; if so, forward the call to the underlying storage node, except for when it is encrypted: Encrypted preallocated images always return effectively random data, so .bdrv_has_zero_init() must always return 0 for them. Reported-by: Stefano Garzarella Signed-off-by: Max Reitz Acked-by: Stefano Garzarella Tested-by: Stefano Garzarella --- block/qcow2.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 039bdc2f7e..730fd53890 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4631,6 +4631,94 @@ static ImageInfoSpecific *qcow2_get_specific_info(Bl= ockDriverState *bs, return spec_info; } =20 +/* + * Return 1 if the file only contains zero and unallocated clusters. + * Return 0 if it contains compressed or normal clusters. + * Return -errno on error. + */ +static int qcow2_is_zero(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + int l1_i; + int ret; + + if (bs->backing) { + return 0; + } + + for (l1_i =3D 0; l1_i < s->l1_size; l1_i++) { + uint64_t l2_offset =3D s->l1_table[l1_i] & L1E_OFFSET_MASK; + int slice_start_i; + + if (!l2_offset) { + continue; + } + + for (slice_start_i =3D 0; slice_start_i < s->l2_size; + slice_start_i +=3D s->l2_slice_size) + { + uint64_t *l2_slice; + int l2_slice_i; + + ret =3D qcow2_cache_get(bs, s->l2_table_cache, + l2_offset + slice_start_i * sizeof(uint6= 4_t), + (void **)&l2_slice); + if (ret < 0) { + return ret; + } + + for (l2_slice_i =3D 0; l2_slice_i < s->l2_slice_size; l2_slice= _i++) { + uint64_t l2_entry =3D be64_to_cpu(l2_slice[l2_slice_i]); + + switch (qcow2_get_cluster_type(bs, l2_entry)) { + case QCOW2_CLUSTER_UNALLOCATED: + case QCOW2_CLUSTER_ZERO_PLAIN: + case QCOW2_CLUSTER_ZERO_ALLOC: + break; + + case QCOW2_CLUSTER_NORMAL: + case QCOW2_CLUSTER_COMPRESSED: + qcow2_cache_put(s->l2_table_cache, (void **)&l2_slice); + return 0; + + default: + abort(); + } + } + + qcow2_cache_put(s->l2_table_cache, (void **)&l2_slice); + } + } + + return 1; +} + +static int qcow2_has_zero_init(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + int ret; + + if (qemu_in_coroutine()) { + qemu_co_mutex_lock(&s->lock); + } + /* Check preallocation status */ + ret =3D qcow2_is_zero(bs); + if (qemu_in_coroutine()) { + qemu_co_mutex_unlock(&s->lock); + } + if (ret < 0) { + return 0; + } + + if (ret =3D=3D 1) { + return 1; + } else if (bs->encrypted) { + return 0; + } else { + return bdrv_has_zero_init(s->data_file->bs); + } +} + static int qcow2_save_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos) { @@ -5186,7 +5274,7 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_child_perm =3D bdrv_format_default_perms, .bdrv_co_create_opts =3D qcow2_co_create_opts, .bdrv_co_create =3D qcow2_co_create, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .bdrv_has_zero_init =3D qcow2_has_zero_init, .bdrv_co_block_status =3D qcow2_co_block_status, =20 .bdrv_co_preadv =3D qcow2_co_preadv, --=20 2.21.0 From nobody Thu May 2 12:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563187561; cv=none; d=zoho.com; s=zohoarc; b=Z6j1a4Z0Q82C1tkTdE20MlX3lK+tRVIA5oDrFWb6n/Huz1iUwnlIyp/pMnyJs2W3zR+LfkGBHvywUWqVKb0U/XvVjteyZ2Ftc7gd6N6+xUUzRZhN/i+px3Q3SNCCXYZ8DasNndEvW4qTdDpqGkvNIdBba1i9PNFdg5VEPTVhuJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563187561; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gm0jeAZlPsKBGvkej3jPjsP/P/7YUEzz5zKc8bI5rSI=; b=Xf5VcdYhiQhqHLObhLbYhM+h0nukSzP2K+GMEZw8AIGw90rhsKnoUCBQvRMT7ehcmXx4cOoaMImEOAPDohjFhmm8ARfSKDkGBgJ++slOFl0CbwoPe0/M3IaZVqoFSGzYqy0OkiEBZ6OUo5IEFmzga2GkOk2dor8SGMx4hUWbcig= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563187561192116.95759994149114; Mon, 15 Jul 2019 03:46:01 -0700 (PDT) Received: from localhost ([::1]:36822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyUZ-0003yP-Lx for importer@patchew.org; Mon, 15 Jul 2019 06:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39350) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyTy-0002L9-EO for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmyTx-0001hH-Df for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42280) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmyTu-0001fR-Oq; Mon, 15 Jul 2019 06:45:18 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15AC2308FC4B; Mon, 15 Jul 2019 10:45:18 +0000 (UTC) Received: from localhost (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8603945C3; Mon, 15 Jul 2019 10:45:17 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Jul 2019 12:45:06 +0200 Message-Id: <20190715104508.7568-3-mreitz@redhat.com> In-Reply-To: <20190715104508.7568-1-mreitz@redhat.com> References: <20190715104508.7568-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 15 Jul 2019 10:45:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1? 2/4] vdi: Fix .bdrv_has_zero_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , Stefan Weil , qemu-devel@nongnu.org, Max Reitz , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Static VDI images cannot guarantee to be zero-initialized. If the image has been statically allocated, forward the call to the underlying storage node. Reported-by: Stefano Garzarella Signed-off-by: Max Reitz Acked-by: Stefano Garzarella Tested-by: Stefano Garzarella --- block/vdi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/block/vdi.c b/block/vdi.c index b9845a4cbd..0caa3f281d 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -988,6 +988,17 @@ static void vdi_close(BlockDriverState *bs) error_free(s->migration_blocker); } =20 +static int vdi_has_zero_init(BlockDriverState *bs) +{ + BDRVVdiState *s =3D bs->opaque; + + if (s->header.image_type =3D=3D VDI_TYPE_STATIC) { + return bdrv_has_zero_init(bs->file->bs); + } else { + return 1; + } +} + static QemuOptsList vdi_create_opts =3D { .name =3D "vdi-create-opts", .head =3D QTAILQ_HEAD_INITIALIZER(vdi_create_opts.head), @@ -1028,7 +1039,7 @@ static BlockDriver bdrv_vdi =3D { .bdrv_child_perm =3D bdrv_format_default_perms, .bdrv_co_create =3D vdi_co_create, .bdrv_co_create_opts =3D vdi_co_create_opts, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .bdrv_has_zero_init =3D vdi_has_zero_init, .bdrv_co_block_status =3D vdi_co_block_status, .bdrv_make_empty =3D vdi_make_empty, =20 --=20 2.21.0 From nobody Thu May 2 12:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563187569; cv=none; d=zoho.com; s=zohoarc; b=i7I1iHNi0/gQqoFpBBsbcMIdiAlKr1Mb83tkhYtJTLHkJq5o+SIpDiTsayNi5N6NebN+9sWRSgyeTl2WOmXzxgIUHmub4mROwBmRYb4bL8VlUAPY6/DVGEaFROWu9E76CbfiuP18G1Be3ybQPdWDCEfE0G4s5MpR1/DIpWg/nKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563187569; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2ZvR9E7e9IIapwYZZnXgJgOvNOaKjbiaKOIxNTAJY2E=; b=L7BaV2NQArx8sOPt7L8iXcW6TmjYixesd4nL2dkSgsOK6IXM3iM5q0jvH7uzUjOpULKduL6S0yot4kJ2Xd7ZAnlKuKkEpDX42YZny7vnwLqsRBMghOSeLM6APHwB82W1TX6cX2qc0oIIXfvuEHzT/4Jmv6W48j/KOMc+10accG8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563187569833473.39459022159474; Mon, 15 Jul 2019 03:46:09 -0700 (PDT) Received: from localhost ([::1]:36824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyUd-0004EO-2F for importer@patchew.org; Mon, 15 Jul 2019 06:46:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39389) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyU1-0002ZE-Qz for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmyU0-0001iw-Bd for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmyTy-0001hN-3N; Mon, 15 Jul 2019 06:45:22 -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 52EE6C057EC6; Mon, 15 Jul 2019 10:45:21 +0000 (UTC) Received: from localhost (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9D806012C; Mon, 15 Jul 2019 10:45:20 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Jul 2019 12:45:07 +0200 Message-Id: <20190715104508.7568-4-mreitz@redhat.com> In-Reply-To: <20190715104508.7568-1-mreitz@redhat.com> References: <20190715104508.7568-1-mreitz@redhat.com> MIME-Version: 1.0 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.32]); Mon, 15 Jul 2019 10:45:21 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1? 3/4] vhdx: Fix .bdrv_has_zero_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , Stefan Weil , qemu-devel@nongnu.org, Max Reitz , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Fixed VHDX images cannot guarantee to be zero-initialized. If the image has the "fixed" subformat, forward the call to the underlying storage node. Reported-by: Stefano Garzarella Signed-off-by: Max Reitz Acked-by: Stefano Garzarella Tested-by: Stefano Garzarella --- block/vhdx.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/block/vhdx.c b/block/vhdx.c index d6070b6fa8..cc9c25d1c4 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -2075,6 +2075,25 @@ static int coroutine_fn vhdx_co_check(BlockDriverSta= te *bs, return 0; } =20 +static int vhdx_has_zero_init(BlockDriverState *bs) +{ + BDRVVHDXState *s =3D bs->opaque; + uint32_t bat_i; + + /* Check the subformat (fixed or dynamic) */ + for (bat_i =3D 0; bat_i < s->bat_entries; bat_i++) { + int state =3D s->bat[bat_i] & VHDX_BAT_STATE_BIT_MASK; + + if (state =3D=3D PAYLOAD_BLOCK_FULLY_PRESENT) { + /* Fixed subformat */ + return bdrv_has_zero_init(bs->file->bs); + } + } + + /* Dynamic subformat */ + return 1; +} + static QemuOptsList vhdx_create_opts =3D { .name =3D "vhdx-create-opts", .head =3D QTAILQ_HEAD_INITIALIZER(vhdx_create_opts.head), @@ -2128,7 +2147,7 @@ static BlockDriver bdrv_vhdx =3D { .bdrv_co_create_opts =3D vhdx_co_create_opts, .bdrv_get_info =3D vhdx_get_info, .bdrv_co_check =3D vhdx_co_check, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .bdrv_has_zero_init =3D vhdx_has_zero_init, =20 .create_opts =3D &vhdx_create_opts, }; --=20 2.21.0 From nobody Thu May 2 12:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563187573; cv=none; d=zoho.com; s=zohoarc; b=FZEgZZKr0Pq1KE5KNLQpa4OfsKbm9VA4z6cbAgMCn6qL+vDPL0bxXI+9TtaNnXS4VcB+e5spS0KjUyWQocx2L8KYVMrpnSb6rPXhZPZHzd3IkrhoDmpBhTVUfM7kClqROhQye2FXDm7Whg8bEcO7dcMVxz/O9L2mkk7z1NLMTBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563187573; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jAQiC12UyDfF7yo7ukCzrbvJJRDRnpn9fyFvcXTQIAQ=; b=NEoRP1pqAfpZCSITl5lRJfjnYm5Tplm7+k/0t1B2sSeMrqk0/FvmCaZ+3dSorGoBm/39h04dDOk7fjd2OgRFxwXdUFb/UnXiaGz8vEHqHS5HjpP/9oyS/sMlbAjdtABn64/NNJSyXqzmVFmI0m89POIMnEisSlU+XwRI6zDCfO0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563187573179359.6477942025118; Mon, 15 Jul 2019 03:46:13 -0700 (PDT) Received: from localhost ([::1]:36826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyUj-0004iC-Br for importer@patchew.org; Mon, 15 Jul 2019 06:46:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39429) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmyU7-0002wf-Uj for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmyU5-0001pT-RB for qemu-devel@nongnu.org; Mon, 15 Jul 2019 06:45:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33774) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmyU1-0001jG-HW; Mon, 15 Jul 2019 06:45:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4458308FEC0; Mon, 15 Jul 2019 10:45:24 +0000 (UTC) Received: from localhost (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1600A45C3; Mon, 15 Jul 2019 10:45:23 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Jul 2019 12:45:08 +0200 Message-Id: <20190715104508.7568-5-mreitz@redhat.com> In-Reply-To: <20190715104508.7568-1-mreitz@redhat.com> References: <20190715104508.7568-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 15 Jul 2019 10:45:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1? 4/4] iotests: Convert to preallocated encrypted qcow2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , Stefan Weil , qemu-devel@nongnu.org, Max Reitz , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add a test case for converting an empty image (which only returns zeroes when read) to a preallocated encrypted qcow2 image. qcow2_has_zero_init() should return 0 then, thus forcing qemu-img convert to create zero clusters. Signed-off-by: Max Reitz Acked-by: Stefano Garzarella Tested-by: Stefano Garzarella --- tests/qemu-iotests/188 | 20 +++++++++++++++++++- tests/qemu-iotests/188.out | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index be7278aa65..afca44df54 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -48,7 +48,7 @@ SECRETALT=3D"secret,id=3Dsec0,data=3Dplatypus" =20 _make_test_img --object $SECRET -o "encrypt.format=3Dluks,encrypt.key-secr= et=3Dsec0,encrypt.iter-time=3D10" $size =20 -IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,encrypt.key-secret= =3Dsec0" +IMGSPEC=3D"driver=3D$IMGFMT,encrypt.key-secret=3Dsec0,file.filename=3D$TES= T_IMG" =20 QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT =20 @@ -68,6 +68,24 @@ echo echo "=3D=3D verify open failure with wrong password =3D=3D" $QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPE= C | _filter_qemu_io | _filter_testdir =20 +_cleanup_test_img + +echo +echo "=3D=3D verify that has_zero_init returns false when preallocating = =3D=3D" + +# Empty source file +if [ -n "$TEST_IMG_FILE" ]; then + TEST_IMG_FILE=3D"${TEST_IMG_FILE}.orig" _make_test_img $size +else + TEST_IMG=3D"${TEST_IMG}.orig" _make_test_img $size +fi + +$QEMU_IMG convert -O "$IMGFMT" --object $SECRET \ + -o "encrypt.format=3Dluks,encrypt.key-secret=3Dsec0,encrypt.iter-time= =3D10,preallocation=3Dmetadata" \ + "${TEST_IMG}.orig" "$TEST_IMG" + +$QEMU_IMG compare --object $SECRET --image-opts "${IMGSPEC}.orig" "$IMGSPE= C" + =20 # success, all done echo "*** done" diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out index 97b1402671..c568ef3701 100644 --- a/tests/qemu-iotests/188.out +++ b/tests/qemu-iotests/188.out @@ -15,4 +15,8 @@ read 16777216/16777216 bytes at offset 0 =20 =3D=3D verify open failure with wrong password =3D=3D qemu-io: can't open: Invalid password, cannot unlock any keyslot + +=3D=3D verify that has_zero_init returns false when preallocating =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=3DIMGFMT size=3D16777216 +Images are identical. *** done --=20 2.21.0