From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPCzv-00056W-F7 for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPCzu-0006hT-ES for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:15 -0500 From: Kevin Wolf Date: Fri, 29 Jan 2016 18:37:14 +0100 Message-Id: <1454089074-4819-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1454089074-4819-1-git-send-email-kwolf@redhat.com> References: <1454089074-4819-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz 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 Reviewed-by: John Snow Reviewed-by: Fam Zheng Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- 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