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 /qmp-commands.hx | |
| parent | 97f3461555b1f5d8d4e6cfc839efe215098d786d (diff) | |
| parent | 90f0b71153c6a85d03967244b9889f892841d835 (diff) | |
| download | qemu-05d4f2f2ca6053bfea2e97cf324901ca18e49c76.tar.gz qemu-05d4f2f2ca6053bfea2e97cf324901ca18e49c76.tar.bz2 qemu-05d4f2f2ca6053bfea2e97cf324901ca18e49c76.zip | |
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 'qmp-commands.hx')
| -rw-r--r-- | qmp-commands.hx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx index 36e08d9ffc..1aef27ca14 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -787,11 +787,17 @@ EQMP { .name = "block-stream", - .args_type = "device:B,base:s?,speed:o?", + .args_type = "device:B,base:s?,speed:o?,on-error:s?", .mhandler.cmd_new = qmp_marshal_input_block_stream, }, { + .name = "block-commit", + .args_type = "device:B,base:s?,top:s,speed:o?", + .mhandler.cmd_new = qmp_marshal_input_block_commit, + }, + + { .name = "block-job-set-speed", .args_type = "device:B,speed:o", .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed, @@ -799,10 +805,20 @@ EQMP { .name = "block-job-cancel", - .args_type = "device:B", + .args_type = "device:B,force:b?", .mhandler.cmd_new = qmp_marshal_input_block_job_cancel, }, { + .name = "block-job-pause", + .args_type = "device:B", + .mhandler.cmd_new = qmp_marshal_input_block_job_pause, + }, + { + .name = "block-job-resume", + .args_type = "device:B", + .mhandler.cmd_new = qmp_marshal_input_block_job_resume, + }, + { .name = "transaction", .args_type = "actions:q", .mhandler.cmd_new = qmp_marshal_input_transaction, |