From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52899)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1ZwlJn-0007th-3O
	for qemu-devel@nongnu.org; Thu, 12 Nov 2015 01:25:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1ZwlJm-0000Y9-7h
	for qemu-devel@nongnu.org; Thu, 12 Nov 2015 01:25:11 -0500
Date: Thu, 12 Nov 2015 14:25:01 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20151112062501.GD4082@ad.usersys.redhat.com>
References: <1447108773-6836-1-git-send-email-mreitz@redhat.com>
	<1447108773-6836-5-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1447108773-6836-5-git-send-email-mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v7 04/24] iotests: Rename filter_nbd to
 _filter_nbd in 083
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>

On Mon, 11/09 23:39, Max Reitz wrote:
> 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 <mreitz@redhat.com>
> ---
>  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
> 
> 

Reviewed-by: Fam Zheng <famz@redhat.com>