diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-10 08:30:34 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-10 08:30:34 -0500 |
commit | b3d6ca770dd916bceaa7a421252734f86dc07e38 (patch) | |
tree | e849419c3356dfc4ba67bf851259ffd3306344e7 /tests/qemu-iotests/027.out | |
parent | b3def7f5ff7cb3f5e6128fbb7b6a9aaade98774d (diff) | |
parent | 2084a8e330bab402e9aab082aad9ce75f9f6db87 (diff) |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (30 commits)
declare ECANCELED on all machines
tests/Makefile: Add missing $(EXESUF)
stream: do not copy unallocated sectors from the base
stream: fix ratelimiting corner case
stream: fix HMP block_job_set_speed
stream: pass new base image format to bdrv_change_backing_file
stream: add testcase for partial streaming
stream: fix sectors not allocated test
qemu-io: fix the alloc command
qemu-io: correctly print non-integer values as decimals
qemu-img: make "info" backing file output correct and easier to use
block: move field reset from bdrv_open_common to bdrv_close
block: protect path_has_protocol from filenames with colons
block: simplify path_is_absolute
block: wait for job callback in block_job_cancel_sync
block: add block_job_sleep_ns
block: fully delete bs->file when closing
block: do not reuse the backing file across bdrv_close/bdrv_open
block: another bdrv_append fix
block: fix snapshot on QED
...
Diffstat (limited to 'tests/qemu-iotests/027.out')
-rw-r--r-- | tests/qemu-iotests/027.out | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/027.out b/tests/qemu-iotests/027.out index a45c303724..4fcb4161da 100644 --- a/tests/qemu-iotests/027.out +++ b/tests/qemu-iotests/027.out @@ -19,5 +19,5 @@ read 2048/2048 bytes at offset 0 == verify zeroes after sub-cluster pattern == read 2560/2560 bytes at offset 1024 -2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +2.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done |