All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <famz@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 3/8] iotests: Change coding style of _filter_nbd in 083
Date: Mon, 25 Jan 2016 19:41:10 +0100	[thread overview]
Message-ID: <1453747275-9468-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1453747275-9468-1-git-send-email-mreitz@redhat.com>

In order to be able to move _filter_nbd to common.filter in the next
patch, its coding style needs to be adapted to that of common.filter.
That means, we have to convert tabs to four spaces, adjust the alignment
of the last line (done with spaces already, assuming one tab equals
eight spaces), fix the line length of the comment, and add a line break
before the opening brace.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/083 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 13495bc..36e6de8 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -49,15 +49,16 @@ wait_for_tcp_port() {
 	done
 }
 
-_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.
-	#
-	# Filter out the TCP port number since this changes between runs.
-	sed -e 's#^.*nbd/.*\.c:.*##g' \
-	    -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
-            -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
+_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.
+    #
+    # Filter out the TCP port number since this changes between runs.
+    sed -e 's#^.*nbd/.*\.c:.*##g' \
+        -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
+        -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
 }
 
 check_disconnect() {
-- 
2.7.0

  parent reply	other threads:[~2016-01-25 18:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25 18:41 [Qemu-devel] [PATCH 0/8] nbd: Fix failed assertion on negotiation error Max Reitz
2016-01-25 18:41 ` [Qemu-devel] [PATCH 1/8] nbd: client_close on error in nbd_co_client_start Max Reitz
2016-01-25 20:26   ` Eric Blake
2016-01-25 22:05   ` Daniel P. Berrange
2016-01-27 15:12     ` Max Reitz
2016-01-26  9:32   ` Kevin Wolf
2016-01-26  9:33     ` Paolo Bonzini
2016-01-25 18:41 ` [Qemu-devel] [PATCH 2/8] iotests: Rename filter_nbd to _filter_nbd in 083 Max Reitz
2016-01-25 18:41 ` Max Reitz [this message]
2016-01-25 20:27   ` [Qemu-devel] [PATCH 3/8] iotests: Change coding style of " Eric Blake
2016-01-25 18:41 ` [Qemu-devel] [PATCH 4/8] iotests: Move _filter_nbd into common.filter Max Reitz
2016-01-25 20:27   ` Eric Blake
2016-01-25 18:41 ` [Qemu-devel] [PATCH 5/8] iotests: Make _filter_nbd drop log lines Max Reitz
2016-01-25 20:33   ` Eric Blake
2016-01-25 18:41 ` [Qemu-devel] [PATCH 6/8] iotests: Make _filter_nbd support more URL types Max Reitz
2016-01-25 18:41 ` [Qemu-devel] [PATCH 7/8] iotests: Make redirecting qemu's stderr optional Max Reitz
2016-01-25 18:41 ` [Qemu-devel] [PATCH 8/8] iotests: Add test for a nonexistent NBD export Max Reitz
2016-01-25 20:34   ` Eric Blake
2016-01-26  9:44 ` [Qemu-devel] [PATCH 0/8] nbd: Fix failed assertion on negotiation error Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453747275-9468-4-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.