qmp: add block_job_set_speed command

Add block_job_set_speed, which sets the maximum speed for a background
block operation.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Acked-by: Luiz Capitulino <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>

diff --git a/blockdev.c b/blockdev.c
index 06f179ef877b2ccc66028ff085446ee2bebe3fd7..4c8fcdd31e36308a4039370f0b507cf57007be75 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -964,3 +964,28 @@ void qmp_block_stream(const char *device, bool has_base,
 
     trace_qmp_block_stream(bs, bs->job);
 }
 
     trace_qmp_block_stream(bs, bs->job);
 }

+
+static BlockJob *find_block_job(const char *device)
+{
+    BlockDriverState *bs;
+
+    bs = bdrv_find(device);
+    if (!bs || !bs->job) {
+        return NULL;
+    }
+    return bs->job;
+}
+
+void qmp_block_job_set_speed(const char *device, int64_t value, Error **errp)
+{
+    BlockJob *job = find_block_job(device);
+
+    if (!job) {
+        error_set(errp, QERR_DEVICE_NOT_ACTIVE, device);
+        return;
+    }
+
+    if (block_job_set_speed(job, value) < 0) {
+        error_set(errp, QERR_NOT_SUPPORTED);
+    }
+}

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 5f09594756fdd244285cc602a360f5afc0be6446..813705ee3554c3c30cb3865a3a4c668cd6e7c7de 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -81,6 +81,20 @@ STEXI
 @item block_stream
 @findex block_stream
 Copy data from a backing file into a block device.
 @item block_stream
 @findex block_stream
 Copy data from a backing file into a block device.

+ETEXI
+
+    {
+        .name       = "block_job_set_speed",
+        .args_type  = "device:B,value:o",
+        .params     = "device value",
+        .help       = "set maximum speed for a background block operation",
+        .mhandler.cmd = hmp_block_job_set_speed,
+    },
+
+STEXI
+@item block_job_set_stream
+@findex block_job_set_stream
+Set maximum speed for a background block operation.

 ETEXI
 
     {
 ETEXI
 
     {

diff --git a/hmp.c b/hmp.c
index cde8d7a5cb6a2a00ae090e4943e521ea0149257b..bf3d9df88f89080045d62618b732f975ef059041 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -794,3 +794,14 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
 
     hmp_handle_error(mon, &error);
 }
 
     hmp_handle_error(mon, &error);
 }

+
+void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict)
+{
+    Error *error = NULL;
+    const char *device = qdict_get_str(qdict, "device");
+    int64_t value = qdict_get_int(qdict, "value");
+
+    qmp_block_job_set_speed(device, value, &error);
+
+    hmp_handle_error(mon, &error);
+}

diff --git a/hmp.h b/hmp.h
index 9234f28db688b7c8cfa9d343e8aa9aa42650e1a6..edd902077ee153810fb8158cfd9c4d39006d537d 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -55,5 +55,6 @@ 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_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);

 
 #endif
 
 #endif

diff --git a/qapi-schema.json b/qapi-schema.json
index 9a1d9a936b38e63af953e6660fafb9974b96031c..d9f66c67f1d600f8c4f29165b73e80018cdd5354 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1465,3 +1465,25 @@
 # Since: 1.1
 ##
 { 'command': 'block_stream', 'data': { 'device': 'str', '*base': 'str' } }
 # Since: 1.1
 ##
 { 'command': 'block_stream', 'data': { 'device': 'str', '*base': 'str' } }

+
+##
+# @block_job_set_speed:
+#
+# Set maximum speed for a background block operation.
+#
+# This command can only be issued when there is an active block job.
+#
+# Throttling can be disabled by setting the speed to 0.
+#
+# @device: the device name
+#
+# @value:  the maximum speed, in bytes per second
+#
+# Returns: Nothing on success
+#          If the job type does not support throttling, NotSupported
+#          If streaming is not active on this device, DeviceNotActive
+#
+# Since: 1.1
+##
+{ 'command': 'block_job_set_speed',
+  'data': { 'device': 'str', 'value': 'int' } }

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 0dfc80e26f4954b30761327d21c75c9bb5f415bc..e4615ca795addec70c7c229c89a7f607b9f2f1c8 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -654,6 +654,12 @@ EQMP
         .mhandler.cmd_new = qmp_marshal_input_block_stream,
     },
 
         .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       = "blockdev-snapshot-sync",
         .args_type  = "device:B,snapshot-file:s,format:s?",
     {
         .name       = "blockdev-snapshot-sync",
         .args_type  = "device:B,snapshot-file:s,format:s?",