On Tue, 02/24 10:35, Max Reitz wrote:
> Redirecting qemu's stderr to stdout makes working with the stderr output
> difficult due to the other file descriptor magic performed in
> _launch_qemu ("ambiguous redirect").
>
> There is no harm in leaving stderr on stderr, so do it.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> If someone has a better solution, especially regarding the redirection
> to a subshell here (tests 091 and 109) and in the next patch, I'd be
> very grateful. All of my efforts to pipe the output of the _launch_qemu
> function resulted in said error ("ambiguous redirect"), so I had to keep
> it on stderr and I did not find another way to pipe stderr to another
> program.
It will be much less hacky if we compare to a separate stderr reference
(tests/qemu-iotests/109.err), similiar to QAPI tests, or just ignore stderr
where we don't really care.
> ---
> tests/qemu-iotests/091 | 3 +-
> tests/qemu-iotests/109 | 3 +-
> tests/qemu-iotests/109.out | 66
> +++++++++++++++++++++---------------------
> tests/qemu-iotests/common.qemu | 1 -
> 4 files changed, 37 insertions(+), 36 deletions(-)
>
> diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
> index 32bbd56..caea1ce 100755
> --- a/tests/qemu-iotests/091
> +++ b/tests/qemu-iotests/091
> @@ -68,7 +68,8 @@ echo
> echo === Starting QEMU VM2 ===
> echo
> _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk \
> - -incoming "exec: cat '${MIG_FIFO}'"
> + -incoming "exec: cat '${MIG_FIFO}'" \
> + 2> >(grep -v 'cat: write error')
> h2=$QEMU_HANDLE
>
> echo
> diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
> index 0b668da..5a23862 100755
> --- a/tests/qemu-iotests/109
> +++ b/tests/qemu-iotests/109
> @@ -53,7 +53,8 @@ function run_qemu()
> local qmp_format="$3"
> local qmp_event="$4"
>
> - _launch_qemu -drive
> file="${source_img}",format=raw,cache=${CACHEMODE},id=src
> + _launch_qemu -drive
> file="${source_img}",format=raw,cache=${CACHEMODE},id=src \
> + 2> >(_filter_testdir | _filter_imgfmt)
> _send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return"
>
> _send_qemu_cmd $QEMU_HANDLE \
> diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out
> index 7db92c9..9dd1d19 100644
> --- a/tests/qemu-iotests/109.out
> +++ b/tests/qemu-iotests/109.out
> @@ -5,13 +5,13 @@ QA output created by 109
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -26,13 +26,13 @@ Images are identical.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 197120, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -47,13 +47,13 @@ Images are identical.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -68,13 +68,13 @@ Images are identical.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -89,13 +89,13 @@ Images are identical.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 65536, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -110,13 +110,13 @@ Images are identical.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -130,13 +130,13 @@ Images are identical.
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -151,13 +151,13 @@ Images are identical.
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 31457280, "offset":
> 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -172,13 +172,13 @@ Images are identical.
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -193,13 +193,13 @@ Images are identical.
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action":
> "report"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2048, "offset": 0,
> "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
> {"return": []}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> @@ -214,12 +214,12 @@ Images are identical.
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> {"return": {}}
> -WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing
> guessed raw.
> -Automatically detecting the format is dangerous for raw images, write
> operations on block 0 will be restricted.
> -Specify the 'raw' format explicitly to remove the restrictions.
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_JOB_READY", "data": {"device": "src", "len": 512, "offset": 512,
> "speed": 0, "type": "mirror"}}
> {"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 512,
> "offset": 512, "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
> +WARNING: Image format was not specified for 'TEST_DIR/t.IMGFMT' and probing
> guessed IMGFMT.
> + Automatically detecting the format is dangerous for IMGFMT images,
> write operations on block 0 will be restricted.
> + Specify the 'IMGFMT' format explicitly to remove the restrictions.
> Warning: Image size mismatch!
> Images are identical.
> {"return": {}}
> diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
> index 4e1996c..5f10c1e 100644
> --- a/tests/qemu-iotests/common.qemu
> +++ b/tests/qemu-iotests/common.qemu
> @@ -155,7 +155,6 @@ function _launch_qemu()
>
> "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest "${@}" \
>
> >"${fifo_out}" \
> - 2>&1 \
>
> <"${fifo_in}" &
> QEMU_PID[${_QEMU_HANDLE}]=$!
>
> --
> 2.1.0
>
>
