From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
John Snow <jsnow@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v7 05/24] iotests: Change coding style of _filter_nbd in 083
Date: Mon, 9 Nov 2015 23:39:14 +0100 [thread overview]
Message-ID: <1447108773-6836-6-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1447108773-6836-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 664f0cf..c00a66b 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.6.2
next prev parent reply other threads:[~2015-11-09 22:39 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-09 22:39 [Qemu-devel] [PATCH v7 for-2.6 00/24] block: Rework bdrv_close_all() Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 01/24] blockdev: Add missing bdrv_unref() in drive-backup Max Reitz
2015-11-12 6:14 ` Fam Zheng
2015-11-18 15:24 ` Kevin Wolf
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 02/24] blockjob: Call bdrv_unref() on creation error Max Reitz
2015-11-12 6:16 ` Fam Zheng
2015-11-18 15:24 ` Kevin Wolf
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close() Max Reitz
2015-11-11 21:08 ` John Snow
2015-11-12 6:23 ` Fam Zheng
2015-11-13 22:49 ` John Snow
2015-11-16 1:27 ` Fam Zheng
2015-11-16 17:07 ` John Snow
2015-11-17 4:22 ` Fam Zheng
2015-11-17 17:05 ` [Qemu-devel] Closing Bitmaps (Was: Re: [PATCH v7 03/24] block: Release dirty bitmaps in bdrv_close()) John Snow
2015-11-18 2:29 ` Fam Zheng
2015-11-18 15:47 ` John Snow
2015-11-18 15:03 ` Kevin Wolf
2015-11-18 15:49 ` John Snow
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 04/24] iotests: Rename filter_nbd to _filter_nbd in 083 Max Reitz
2015-11-12 6:25 ` Fam Zheng
2015-11-09 22:39 ` Max Reitz [this message]
2015-11-12 6:25 ` [Qemu-devel] [PATCH v7 05/24] iotests: Change coding style of " Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 06/24] iotests: Move _filter_nbd into common.filter Max Reitz
2015-11-12 6:26 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 07/24] iotests: Make _filter_nbd drop log lines Max Reitz
2015-11-12 6:27 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 08/24] iotests: Make _filter_nbd support more URL types Max Reitz
2015-11-12 6:28 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 09/24] iotests: Make redirecting qemu's stderr optional Max Reitz
2015-11-12 6:31 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 10/24] iotests: Add test for eject under NBD server Max Reitz
2015-11-11 21:46 ` John Snow
2015-11-12 6:37 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 11/24] block: Add BB-BDS remove/insert notifiers Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 12/24] virtio-blk: Functions for op blocker management Max Reitz
2015-11-25 15:57 ` Kevin Wolf
2015-11-25 16:03 ` Max Reitz
2015-11-25 16:18 ` Kevin Wolf
2015-11-25 16:26 ` Max Reitz
2015-11-26 7:48 ` Stefan Hajnoczi
2015-11-26 10:43 ` Kevin Wolf
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 13/24] virtio-scsi: Catch BDS-BB removal/insertion Max Reitz
2015-11-25 16:03 ` Kevin Wolf
2015-11-25 16:08 ` Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 14/24] nbd: Switch from close to eject notifier Max Reitz
2015-11-30 15:36 ` Kevin Wolf
2015-11-30 17:22 ` Max Reitz
2015-12-01 13:16 ` Kevin Wolf
2015-12-02 15:51 ` Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 15/24] block: Remove BDS close notifier Max Reitz
2015-11-30 15:38 ` Kevin Wolf
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 16/24] block: Use blk_remove_bs() in blk_delete() Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 17/24] blockdev: Use blk_remove_bs() in do_drive_del() Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 18/24] block: Make bdrv_close() static Max Reitz
2015-11-12 7:07 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 19/24] block: Add list of all BlockDriverStates Max Reitz
2015-11-12 7:12 ` Fam Zheng
2015-11-16 16:03 ` Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 20/24] blockdev: Keep track of monitor-owned BDS Max Reitz
2015-11-10 1:25 ` Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 21/24] block: Add blk_remove_all_bs() Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 22/24] block: Rewrite bdrv_close_all() Max Reitz
2015-11-12 7:34 ` Fam Zheng
2015-11-16 16:15 ` Max Reitz
2015-11-18 2:52 ` Fam Zheng
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 23/24] iotests: Add test for multiple BB on BDS tree Max Reitz
2015-11-09 22:39 ` [Qemu-devel] [PATCH v7 24/24] iotests: Add test for block jobs and BDS ejection Max Reitz
2015-11-30 16:23 ` Kevin Wolf
2015-11-30 17:44 ` Max Reitz
2015-11-25 16:09 ` [Qemu-devel] [PATCH v7 for-2.6 00/24] block: Rework bdrv_close_all() 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=1447108773-6836-6-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).