| Message ID | 20250417184133.105746-22-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Make blockdev-mirror dest sparse in more cases | expand |
On Thu, Apr 17, 2025 at 01:39:14PM -0500, Eric Blake wrote: > From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> > > 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 <andrey.drobyshev@virtuozzo.com> > Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> > Reviewed-by: Alberto Garcia <berto@igalia.com> > Message-ID: <20240913163942.423050-6-andrey.drobyshev@virtuozzo.com> > Signed-off-by: Eric Blake <eblake@redhat.com> > --- > tests/qemu-iotests/common.rc | 6 ++++++ > tests/qemu-iotests/250 | 5 ----- > 2 files changed, 6 insertions(+), 5 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
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=1 "$1" | awk '{print $1}' +} + # Set the variables to the empty string to turn Valgrind off # for specific processes, e.g. # $ VALGRIND_QEMU_IO= ./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 succeed # anyway. -disk_usage() -{ - du --block-size=1 $1 | awk '{print $1}' -} - size=2100M _make_test_img -o "cluster_size=1M,preallocation=metadata" $size