Merge commit 'fb0490f69feb96b7e92457f176dc834ff0b00b09' into upstream-merge

* commit 'fb0490f69feb96b7e92457f176dc834ff0b00b09': (30 commits)
  block: add -drive copy-on-read=on|off
  block: core copy-on-read logic
  block: request overlap detection
  block: wait for overlapping requests
  block: add interface to toggle copy-on-read
  block: add request tracking
  coroutine: add qemu_co_queue_restart_all()
  qemu-common: add QEMU_ALIGN_DOWN() and QEMU_ALIGN_UP() macros
  block: add bdrv_co_is_allocated() interface
  block: drop .bdrv_is_allocated() interface
  cow: convert to .bdrv_co_is_allocated()
  vdi: convert to .bdrv_co_is_allocated()
  vvfat: convert to .bdrv_co_is_allocated()
  block: convert qcow2, qcow2, and vmdk to .bdrv_co_is_allocated()
  qed: convert to .bdrv_co_is_allocated()
  block: add .bdrv_co_is_allocated()
  block: use public bdrv_is_allocated() interface
  qcow2: Fix error path in qcow2_snapshot_load_tmp
  qcow2: Fix order in qcow2_snapshot_delete
  qcow2: Fix order of refcount updates in qcow2_snapshot_goto
  ...

Conflicts:
	qemu-config.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 7fff785c6..5be4407e6 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -860,9 +860,10 @@ ETEXI
         .args_type  = "pci_addr:s,opts:s",
         .params     = "[[<domain>:]<bus>:]<slot>\n"
                       "[file=file][,if=type][,bus=n]\n"
-                      "[,unit=m][,media=d][index=i]\n"
+                      "[,unit=m][,media=d][,index=i]\n"
                       "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
-                      "[snapshot=on|off][,cache=on|off]",
+                      "[,snapshot=on|off][,cache=on|off]\n"
+                      "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",
         .mhandler.cmd = drive_hot_add,
     },
@@ -1207,6 +1208,21 @@ ETEXI
     },
 
 STEXI
+@item block_set_io_throttle @var{device} @var{bps} @var{bps_rd} @var{bps_wr} @var{iops} @var{iops_rd} @var{iops_wr}
+@findex block_set_io_throttle
+Change I/O throttle limits for a block drive to @var{bps} @var{bps_rd} @var{bps_wr} @var{iops} @var{iops_rd} @var{iops_wr}
+ETEXI
+
+    {
+        .name       = "block_set_io_throttle",
+        .args_type  = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l",
+        .params     = "device bps bps_rd bps_wr iops iops_rd iops_wr",
+        .help       = "change I/O throttle limits for a block drive",
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_block_set_io_throttle,
+    },
+
+STEXI
 @item block_passwd @var{device} @var{password}
 @findex block_passwd
 Set the encrypted device @var{device} password to @var{password}