diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:53:50 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:53:50 -0500 |
| commit | 05d4f2f2ca6053bfea2e97cf324901ca18e49c76 (patch) | |
| tree | eeac556997cb7a8d45472919fe9b59a41ba9ed71 /tests/qemu-iotests/group | |
| parent | 97f3461555b1f5d8d4e6cfc839efe215098d786d (diff) | |
| parent | 90f0b71153c6a85d03967244b9889f892841d835 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (30 commits)
qemu-iotests: add tests for streaming error handling
qemu-iotests: map underscore to dash in QMP argument names
blkdebug: process all set_state rules in the old state
stream: add on-error argument
block: introduce block job error
iostatus: reorganize io error code
iostatus: change is_read to a bool
iostatus: move BlockdevOnError declaration to QAPI
iostatus: rename BlockErrorAction, BlockQMPEventAction
qemu-iotests: add test for pausing a streaming operation
qmp: add block-job-pause and block-job-resume
block: add support for job pause/resume
qmp: add 'busy' member to BlockJobInfo
block: add block_job_query
block: move job APIs to separate files
block: fix documentation of block_job_cancel_sync
qerror/block: introduce QERR_BLOCK_JOB_NOT_ACTIVE
qemu-iotests: add initial tests for live block commit
QAPI: add command for live block commit, 'block-commit'
block: helper function, to find the base image of a chain
...
Diffstat (limited to 'tests/qemu-iotests/group')
| -rw-r--r-- | tests/qemu-iotests/group | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index ebb5ca4b41..66d2ba9689 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -36,7 +36,7 @@ 027 rw auto quick 028 rw backing auto 029 rw auto quick -030 rw auto +030 rw auto backing 031 rw auto quick 032 rw auto 033 rw auto @@ -46,3 +46,4 @@ 037 rw auto backing 038 rw auto backing 039 rw auto +040 rw auto |