[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 04/24] iotests: Rename filter_nbd to _filter_nbd
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 04/24] iotests: Rename filter_nbd to _filter_nbd in 083 |
Date: |
Mon, 9 Nov 2015 23:39:13 +0100 |
In the patch after the next, this function is moved to common.filter.
Therefore, its name should be preceded by an underscore to signify its
global availability.
To keep the code motion patch clean, we cannot rename it in the same
patch, so we need to choose some order of renaming vs. motion. It is
better to keep a supposedly global function used by only a single test
in that test than to keep a supposedly local function in a common* file
and use it from a test, so we should rename the function before moving
it.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/083 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 1b2d3f1..664f0cf 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -49,7 +49,7 @@ wait_for_tcp_port() {
done
}
-filter_nbd() {
+_filter_nbd() {
# nbd.c error messages contain function names and line numbers that are
prone
# to change. Message ordering depends on timing between send and
receive
# callbacks sometimes, making them unreliable.
@@ -84,7 +84,7 @@ EOF
$PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port"
"$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
wait_for_tcp_port "127\\.0\\.0\\.1:$port"
- $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | filter_nbd
+ $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | _filter_nbd
echo
}
--
2.6.2
- [Qemu-devel] [PATCH v7 for-2.6 00/24] block: Rework bdrv_close_all(), Max Reitz, 2015/11/09
- [Qemu-devel] [PATCH v7 01/24] blockdev: Add missing bdrv_unref() in drive-backup, Max Reitz, 2015/11/09
- [Qemu-devel] [PATCH v7 02/24] blockjob: Call bdrv_unref() on creation error, Max Reitz, 2015/11/09
- [Qemu-devel] [PATCH v7 04/24] iotests: Rename filter_nbd to _filter_nbd in 083,
Max Reitz <=
- [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), Max Reitz, 2015/11/09
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), John Snow, 2015/11/11
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), Fam Zheng, 2015/11/12
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), John Snow, 2015/11/13
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), Fam Zheng, 2015/11/16
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), John Snow, 2015/11/16
- Re: [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close(), Fam Zheng, 2015/11/16
- [Qemu-devel] Closing Bitmaps (Was: Re: [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close()), John Snow, 2015/11/17
- Re: [Qemu-devel] Closing Bitmaps (Was: Re: [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close()), Fam Zheng, 2015/11/17