From nobody Sun Oct 5 17:17:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745542583; cv=none; d=zohomail.com; s=zohoarc; b=mHIuBYE8FBTbk+7YmuCWxhMJOulmH3AW0UuKg/dovedmqXR0H/zGVkQRfnG0SadawuqfsWPoL2uw23ZjiIKmADG9+uBBsB5klpgyy4ZnxSadjRnYwuNULYzLEB55r+1eNHNo1rlgxX+562U5/2mZB7/CY5j2LoItNCTvyNlZwPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745542583; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i16aZxxw0o1rdljUx+f96coAB3U70GB6E7l1CM3DuE8=; b=hKkMRD3ajKuKOp7qJqHhzntQLlqGu0PrMXkSJR1psIklcAvXCUnWNipnScJJDkWyMiz2gubeIhfxs50HSuuaoK/QVok9Mryg9pwcB+0n+iV8pByY/kojf8EiQaiwQzi++OLp2zUhDCFrP/UJk4Z+JCXxKlhtoFd2qiMlNWCGka4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745542583798296.5769242123441; Thu, 24 Apr 2025 17:56:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u87Ll-00070T-6D; Thu, 24 Apr 2025 20:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u87Lh-0006zV-Kb for qemu-devel@nongnu.org; Thu, 24 Apr 2025 20:55:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u87Lf-0000nh-8J for qemu-devel@nongnu.org; Thu, 24 Apr 2025 20:55:25 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-35-tEibCA-cPOWMISF5UEgsXA-1; Thu, 24 Apr 2025 20:55:18 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 92C3C1800446; Fri, 25 Apr 2025 00:55:16 +0000 (UTC) Received: from green.redhat.com (unknown [10.2.16.59]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 472F61800374; Fri, 25 Apr 2025 00:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745542522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i16aZxxw0o1rdljUx+f96coAB3U70GB6E7l1CM3DuE8=; b=ALJ7fQLh8JowBA1ed9fM3zD4hEyF8pp7J9SZ+hh3Z+neIJDP4usdXZe7FzfAS9hPT4ffYA GsFL97V8FBwF5DuN9w6YJJPZbyzkoZC+sO4MR8V/ezxounxAcG8WePR9K4F9nfxS/BnFiC PJJf5wOFHLv9RbBbds1a+9ZHn9mLHAU= X-MC-Unique: tEibCA-cPOWMISF5UEgsXA-1 X-Mimecast-MFC-AGG-ID: tEibCA-cPOWMISF5UEgsXA_1745542516 From: Eric Blake To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, vsementsov@yandex-team.ru, stefanha@redhat.com, Andrey Drobyshev , Alexander Ivanov , Alberto Garcia , Kevin Wolf , Hanna Reitz Subject: [PATCH v3 09/11] iotests/common.rc: add disk_usage function Date: Thu, 24 Apr 2025 19:52:09 -0500 Message-ID: <20250425005439.2252467-22-eblake@redhat.com> In-Reply-To: <20250425005439.2252467-13-eblake@redhat.com> References: <20250425005439.2252467-13-eblake@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.84, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1745542584740019000 Content-Type: text/plain; charset="utf-8" From: Andrey Drobyshev Move the definition from iotests/250 to common.rc. This is used to detect real disk usage of sparse files. In particular, we want to use it for checking subclusters-based discards. Signed-off-by: Andrey Drobyshev Reviewed-by: Alexander Ivanov Reviewed-by: Alberto Garcia Message-ID: <20240913163942.423050-6-andrey.drobyshev@virtuozzo.com> Signed-off-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/common.rc | 6 ++++++ tests/qemu-iotests/250 | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 95c12577dd4..237f746af88 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -140,6 +140,12 @@ _optstr_add() fi } +# report real disk usage for sparse files +disk_usage() +{ + du --block-size=3D1 "$1" | awk '{print $1}' +} + # Set the variables to the empty string to turn Valgrind off # for specific processes, e.g. # $ VALGRIND_QEMU_IO=3D ./check -qcow2 -valgrind 015 diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250 index af48f83abac..c0a0dbc0ff1 100755 --- a/tests/qemu-iotests/250 +++ b/tests/qemu-iotests/250 @@ -52,11 +52,6 @@ _unsupported_imgopts data_file # bdrv_co_truncate(bs->file) call in qcow2_co_truncate(), which might succ= eed # anyway. -disk_usage() -{ - du --block-size=3D1 $1 | awk '{print $1}' -} - size=3D2100M _make_test_img -o "cluster_size=3D1M,preallocation=3Dmetadata" $size --=20 2.49.0