diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 08:58:52 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 08:58:52 -0600 |
| commit | 21fe5bc678b16d748db385fb1be95caa96b00eee (patch) | |
| tree | 33342168c916f107f2c1e89c8fff8490b9e46f88 /monitor.c | |
| parent | 96bab41df61b532bb6954a38527ad8403859a6c9 (diff) | |
| parent | e2f0c49ffae8d3a00272c3cbc68850cc5aafbffa (diff) | |
| download | qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.zip qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.tar.gz qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.tar.bz2 | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (22 commits)
scsi: Guard against buflen exceeding req->cmd.xfer in scsi_disk_emulate_command
qcow: Use bdrv functions to replace file operation
qcow: Return real error code in qcow_open
block/vdi: Zero unused parts when allocating a new block (fix #919242)
virtio-blk: add virtio_blk_handle_read trace event
docs: describe live block operations
block: add support for partial streaming
add QERR_BASE_NOT_FOUND
block: add bdrv_find_backing_image
blockdev: make image streaming safe across hotplug
qmp: add query-block-jobs
qmp: add block_job_cancel command
qmp: add block_job_set_speed command
qmp: add block_stream command
block: rate-limit streaming operations
block: add image streaming block job
block: add BlockJob interface for long-running operations
block: make copy-on-read a per-request flag
block: check bdrv_in_use() before blockdev operations
coroutine: add co_sleep_ns() coroutine sleep function
...
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -479,6 +479,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_SPICE_DISCONNECTED: event_name = "SPICE_DISCONNECTED"; break; + case QEVENT_BLOCK_JOB_COMPLETED: + event_name = "BLOCK_JOB_COMPLETED"; + break; + case QEVENT_BLOCK_JOB_CANCELLED: + event_name = "BLOCK_JOB_CANCELLED"; + break; default: abort(); break; @@ -2312,6 +2318,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_blockstats, }, { + .name = "block-jobs", + .args_type = "", + .params = "", + .help = "show progress of ongoing block device operations", + .mhandler.info = hmp_info_block_jobs, + }, + { .name = "registers", .args_type = "", .params = "", |