These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / tests / qemu-iotests / 083

diff --git a/qemu/tests/qemu-iotests/083 b/qemu/tests/qemu-iotests/083
index 1b2d3f1..bc724ae 100755 (executable)
--- a/qemu/tests/qemu-iotests/083
+++ b/qemu/tests/qemu-iotests/083
@@ -25,7 +25,6 @@ seq=`basename $0`
 echo "QA output created by $seq"
 
 here=`pwd`
-tmp=/tmp/$$
 status=1       # failure is the default!
 
 # get standard environment, filters and checks
@@ -49,17 +48,6 @@ 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#'
-}
-
 check_disconnect() {
        event=$1
        when=$2
@@ -84,7 +72,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
 }