diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-04 14:25:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-04 14:25:08 +0100 |
| commit | bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d (patch) | |
| tree | acd2201a7f374badd8c9f16c9917a6e93af40285 /tests | |
| parent | 6e11eb2d2b96790e647aa4c744ed2ed03a77fbbd (diff) | |
| parent | 7d992e4d5a95d0b21c6c33bd32cef8671805e39b (diff) | |
| download | qemu-bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d.zip qemu-bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d.tar.gz qemu-bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Thu 29 Sep 2016 14:11:30 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
oslib-posix: add a configure switch to debug stack usage
coroutine-sigaltstack: use helper for allocating stack memory
coroutine-ucontext: use helper for allocating stack memory
coroutine: add a macro for the coroutine stack size
coroutine-sigaltstack: rename coroutine struct appropriately
oslib-posix: add helpers for stack alloc and free
block: Remove qemu_root_bds_opts
block: Move 'discard' option to bdrv_open_common()
block: Use 'detect-zeroes' option for 'blockdev-change-medium'
block: Parse 'detect-zeroes' in bdrv_open_common()
block/qapi: Move 'aio' option to file driver
block/qapi: Use separate options type for curl driver
block: Drop aio/cache consistency check from qmp_blockdev_add()
block: Fix error path in qmp_blockdev_change_medium()
block-backend: remove blk_flush_all
qemu: use bdrv_flush_all for vm_stop et al
block: reintroduce bdrv_flush_all
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/087 | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/087.out | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 5c04577..b1ac71f 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -117,10 +117,10 @@ run_qemu <<EOF "options": { "driver": "$IMGFMT", "node-name": "disk", - "aio": "native", "file": { "driver": "file", - "filename": "$TEST_IMG" + "filename": "$TEST_IMG", + "aio": "native" } } } diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out index bef6862..cd02eae 100644 --- a/tests/qemu-iotests/087.out +++ b/tests/qemu-iotests/087.out @@ -27,7 +27,7 @@ QMP_VERSION Testing: QMP_VERSION {"return": {}} -{"error": {"class": "GenericError", "desc": "aio=native requires cache.direct=true"}} +{"error": {"class": "GenericError", "desc": "aio=native was specified, but it requires cache.direct=on, which was not specified."}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} |