summary refs log tree commit diff stats
path: root/qmp-commands.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-01-27 08:58:52 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-01-27 08:58:52 -0600
commit21fe5bc678b16d748db385fb1be95caa96b00eee (patch)
tree33342168c916f107f2c1e89c8fff8490b9e46f88 /qmp-commands.hx
parent96bab41df61b532bb6954a38527ad8403859a6c9 (diff)
parente2f0c49ffae8d3a00272c3cbc68850cc5aafbffa (diff)
downloadfocaccia-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 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx24
1 files changed, 24 insertions, 0 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 799e655988..bd6b6410ad 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -649,6 +649,24 @@ Example:
 EQMP
 
     {
+        .name       = "block_stream",
+        .args_type  = "device:B,base:s?",
+        .mhandler.cmd_new = qmp_marshal_input_block_stream,
+    },
+
+    {
+        .name       = "block_job_set_speed",
+        .args_type  = "device:B,value:o",
+        .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed,
+    },
+
+    {
+        .name       = "block_job_cancel",
+        .args_type  = "device:B",
+        .mhandler.cmd_new = qmp_marshal_input_block_job_cancel,
+    },
+
+    {
         .name       = "blockdev-snapshot-sync",
         .args_type  = "device:B,snapshot-file:s,format:s?",
         .mhandler.cmd_new = qmp_marshal_input_blockdev_snapshot_sync,
@@ -1996,6 +2014,12 @@ EQMP
     },
 
     {
+        .name       = "query-block-jobs",
+        .args_type  = "",
+        .mhandler.cmd_new = qmp_marshal_input_query_block_jobs,
+    },
+
+    {
         .name       = "qom-list",
         .args_type  = "path:s",
         .mhandler.cmd_new = qmp_marshal_input_qom_list,