From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvqYv-0007e1-0V for qemu-devel@nongnu.org; Tue, 23 Aug 2011 08:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvqYs-000248-9H for qemu-devel@nongnu.org; Tue, 23 Aug 2011 08:58:36 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:51807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvqYs-00023g-0f for qemu-devel@nongnu.org; Tue, 23 Aug 2011 08:58:34 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p7NCwW3N026406 for ; Tue, 23 Aug 2011 12:58:32 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7NCwUfJ1986616 for ; Tue, 23 Aug 2011 13:58:32 +0100 Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7NCwUXX021079 for ; Tue, 23 Aug 2011 13:58:30 +0100 From: Stefan Hajnoczi Date: Tue, 23 Aug 2011 13:58:23 +0100 Message-Id: <1314104305-20523-3-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1314104305-20523-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1314104305-20523-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/4] qmp: add block_job_set_speed command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefan Hajnoczi , Adam Litke This patch introduces the block_job_set_speed HMP/QMP command. It is currently unimplemented and returns the 'NotSupported' error. 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. Arguments: - device: device name (json-string) - value: maximum speed, in bytes per second (json-int) Errors: NotSupported: job type does not support speed setting DeviceNotActive: streaming is not active on this device Example: -> { "execute": "block_job_set_speed", "arguments": { "device": "virtio0", "value": 1024 } } Signed-off-by: Stefan Hajnoczi --- blockdev.c | 19 +++++++++++++++++++ blockdev.h | 2 ++ hmp-commands.hx | 15 +++++++++++++++ qmp-commands.hx | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index 208bfc9..ee40263 100644 --- a/blockdev.c +++ b/blockdev.c @@ -808,3 +808,22 @@ int do_block_stream(Monitor *mon, const QDict *params, QObject **ret_data) qerror_report(QERR_NOT_SUPPORTED); return -1; } + +int do_block_job_set_speed(Monitor *mon, const QDict *params, + QObject **ret_data) +{ + const char *device = qdict_get_str(params, "device"); + BlockDriverState *bs; + + bs = bdrv_find(device); + if (!bs) { + qerror_report(QERR_DEVICE_NOT_ACTIVE, device); + return -1; + } + + /* This command is not yet implemented. The device not found check above + * is done so that error ordering will not change when fully implemented. + */ + qerror_report(QERR_NOT_SUPPORTED); + return -1; +} diff --git a/blockdev.h b/blockdev.h index ad98d37..6b48405 100644 --- a/blockdev.h +++ b/blockdev.h @@ -66,5 +66,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_block_resize(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_block_stream(Monitor *mon, const QDict *qdict, QObject **ret_data); +int do_block_job_set_speed(Monitor *mon, const QDict *qdict, + QObject **ret_data); #endif diff --git a/hmp-commands.hx b/hmp-commands.hx index 2a16fd9..a5fb4d5 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -86,6 +86,21 @@ 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", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_block_job_set_speed, + }, + +STEXI +@item block_job_set_stream +@findex block_job_set_stream +Set maximum speed for a background block operation. +ETEXI + + { .name = "eject", .args_type = "force:-f,device:B", .params = "[-f] device", diff --git a/qmp-commands.hx b/qmp-commands.hx index 60c9bdf..eface05 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -759,6 +759,41 @@ Examples: EQMP { + .name = "block_job_set_speed", + .args_type = "device:B,value:o", + .params = "device value", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_block_job_set_speed, + }, + +SQMP + +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. + +Arguments: + +- device: device name (json-string) +- value: maximum speed, in bytes per second (json-int) + +Errors: +NotSupported: job type does not support speed setting +DeviceNotActive: streaming is not active on this device + +Example: + +-> { "execute": "block_job_set_speed", + "arguments": { "device": "virtio0", "value": 1024 } } + +EQMP + + { .name = "blockdev-snapshot-sync", .args_type = "device:B,snapshot-file:s?,format:s?", .params = "device [new-image-file] [format]", -- 1.7.5.4