diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-09 13:54:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-09 13:54:31 +0000 |
| commit | dba5c337c83290d9559c171052c0a0de69fbab2f (patch) | |
| tree | 67ae4fd0f45b3f111a7d5dcff7fdf61326affe46 /tests | |
| parent | 8305f9bdf7ca41ee5cabe018fb37b73472c1162d (diff) | |
| parent | c1bb86cd8ae67c14f79422b6e544d1e2bf40eeb2 (diff) | |
| download | qemu-dba5c337c83290d9559c171052c0a0de69fbab2f.zip qemu-dba5c337c83290d9559c171052c0a0de69fbab2f.tar.gz qemu-dba5c337c83290d9559c171052c0a0de69fbab2f.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Mon 09 Jan 2017 13:43:44 GMT
# 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:
block: Rename raw-{posix,win32} to file-*.c
block: Rename raw_bsd to raw-format.c
blkverify: Implement bdrv_co_preadv/pwritev/flush
blkdebug: Implement bdrv_co_preadv/pwritev/flush
quorum: Clean up quorum_aio_get()
quorum: Inline quorum_fifo_aio_cb()
quorum: Implement .bdrv_co_preadv/pwritev()
quorum: Avoid bdrv_aio_writev() for rewrites
quorum: Inline quorum_aio_cb()
quorum: Do cleanup in caller coroutine
quorum: Implement .bdrv_co_readv/writev
quorum: Remove s from quorum_aio_get() arguments
coroutine: Introduce qemu_coroutine_enter_if_inactive()
qemu-img: fix in-flight count for qemu-img bench
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/071.out | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out index 8ff423f..dd879f1 100644 --- a/tests/qemu-iotests/071.out +++ b/tests/qemu-iotests/071.out @@ -12,7 +12,7 @@ read 512/512 bytes at offset 229376 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -blkverify: read sector_num=0 nb_sectors=1 contents mismatch in sector 0 +blkverify: read offset=0 bytes=512 contents mismatch at offset 0 === Testing blkverify through file blockref === @@ -26,7 +26,7 @@ read 512/512 bytes at offset 229376 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -blkverify: read sector_num=0 nb_sectors=1 contents mismatch in sector 0 +blkverify: read offset=0 bytes=512 contents mismatch at offset 0 === Testing blkdebug through filename === @@ -56,7 +56,7 @@ QMP_VERSION {"return": {}} {"return": {}} {"return": {}} -blkverify: read sector_num=0 nb_sectors=1 contents mismatch in sector 0 +blkverify: read offset=0 bytes=512 contents mismatch at offset 0 === Testing blkverify on existing raw block device === @@ -66,7 +66,7 @@ QMP_VERSION {"return": {}} {"return": {}} {"return": {}} -blkverify: read sector_num=0 nb_sectors=1 contents mismatch in sector 0 +blkverify: read offset=0 bytes=512 contents mismatch at offset 0 === Testing blkdebug's set-state through QMP === |