[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 0
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083 |
Date: |
Fri, 29 Jan 2016 18:37:14 +0100 |
From: Max Reitz <address@hidden>
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>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <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 566da99..13495bc 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
}
--
1.8.3.1
- [Qemu-block] [PULL 00/48] Block patches, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 01/48] block: Add blk_dev_has_tray(), Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 05/48] vmdk: Fix converting to streamOptimized, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 03/48] Revert "hw/block/fdc: Implement tray status", Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 02/48] blockdev: Fix 'change' for slot devices, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 06/48] iotests: Limit supported formats for 118, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 07/48] nbd: client_close on error in nbd_co_client_start, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 11/48] iotests: Make _filter_nbd drop log lines, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 09/48] iotests: Change coding style of _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083,
Kevin Wolf <=
- [Qemu-block] [PULL 12/48] iotests: Make _filter_nbd support more URL types, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 10/48] iotests: Move _filter_nbd into common.filter, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 14/48] iotests: Add test for a nonexistent NBD export, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 15/48] block: Remove unused struct definition BlockFinishData, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 16/48] block: Release named dirty bitmaps in bdrv_close(), Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 19/48] virtio-blk: Functions for op blocker management, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 20/48] virtio-scsi: Catch BDS-BB removal/insertion, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 13/48] iotests: Make redirecting qemu's stderr optional, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 18/48] block: Add BB-BDS remove/insert notifiers, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 17/48] iotests: Add test for eject under NBD server, Kevin Wolf, 2016/01/29