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 /hmp.h | |
| parent | 96bab41df61b532bb6954a38527ad8403859a6c9 (diff) | |
| parent | e2f0c49ffae8d3a00272c3cbc68850cc5aafbffa (diff) | |
| download | focaccia-qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.tar.gz focaccia-qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.zip | |
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 'hmp.h')
| -rw-r--r-- | hmp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hmp.h b/hmp.h index aab0b1f508..18eecbdcb9 100644 --- a/hmp.h +++ b/hmp.h @@ -32,6 +32,7 @@ void hmp_info_vnc(Monitor *mon); void hmp_info_spice(Monitor *mon); void hmp_info_balloon(Monitor *mon); void hmp_info_pci(Monitor *mon); +void hmp_info_block_jobs(Monitor *mon); void hmp_quit(Monitor *mon, const QDict *qdict); void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_system_reset(Monitor *mon, const QDict *qdict); @@ -54,5 +55,8 @@ void hmp_expire_password(Monitor *mon, const QDict *qdict); void hmp_eject(Monitor *mon, const QDict *qdict); void hmp_change(Monitor *mon, const QDict *qdict); void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict); +void hmp_block_stream(Monitor *mon, const QDict *qdict); +void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict); +void hmp_block_job_cancel(Monitor *mon, const QDict *qdict); #endif |