[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 09/10] block: Accept device model name for block_set
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 09/10] block: Accept device model name for block_set_io_throttle |
Date: |
Fri, 19 Aug 2016 18:50:34 +0200 |
In order to remove the necessity to use BlockBackend names in the
external API, we want to allow qdev device names in all device related
commands.
This converts block_set_io_throttle to accept a qdev device name.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 12 +++++++-----
qapi/block-core.json | 6 ++++--
qmp-commands.hx | 6 ++++--
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 6f81b07..6865c2d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2643,10 +2643,10 @@ void qmp_block_set_io_throttle(BlockIOThrottle *arg,
Error **errp)
BlockBackend *blk;
AioContext *aio_context;
- blk = blk_by_name(arg->device);
+ blk = qmp_get_blk(arg->has_device ? arg->device : NULL,
+ arg->has_id ? arg->id : NULL,
+ errp);
if (!blk) {
- error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
- "Device '%s' not found", arg->device);
return;
}
@@ -2655,7 +2655,7 @@ void qmp_block_set_io_throttle(BlockIOThrottle *arg,
Error **errp)
bs = blk_bs(blk);
if (!bs) {
- error_setg(errp, "Device '%s' has no medium", arg->device);
+ error_setg(errp, "Device has no medium");
goto out;
}
@@ -2719,7 +2719,9 @@ void qmp_block_set_io_throttle(BlockIOThrottle *arg,
Error **errp)
* just update the throttling group. */
if (!blk_get_public(blk)->throttle_state) {
blk_io_limits_enable(blk,
- arg->has_group ? arg->group : arg->device);
+ arg->has_group ? arg->group :
+ arg->has_device ? arg->device :
+ arg->id);
} else if (arg->has_group) {
blk_io_limits_update_group(blk, arg->group);
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 9a19a50..b4a5bdb 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1378,6 +1378,8 @@
#
# @device: The name of the device
#
+# @id: the name or QOM path of the guest device (since: 2.8)
+#
# @bps: total throughput limit in bytes per second
#
# @bps_rd: read throughput limit in bytes per second
@@ -1445,8 +1447,8 @@
# Since: 1.1
##
{ 'struct': 'BlockIOThrottle',
- 'data': { 'device': 'str', 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
- 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int',
+ 'data': { '*device': 'str', '*id': 'str', 'bps': 'int', 'bps_rd': 'int',
+ 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int',
'*bps_max': 'int', '*bps_rd_max': 'int',
'*bps_wr_max': 'int', '*iops_max': 'int',
'*iops_rd_max': 'int', '*iops_wr_max': 'int',
diff --git a/qmp-commands.hx b/qmp-commands.hx
index b11e4e4..b58d9d9 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2084,7 +2084,7 @@ EQMP
{
.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,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,bps_max_length:l?,bps_rd_max_length:l?,bps_wr_max_length:l?,iops_max_length:l?,iops_rd_max_length:l?,iops_wr_max_length:l?,iops_size:l?,group:s?",
+ .args_type =
"device:B?,id:s?,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l,bps_max:l?,bps_rd_max:l?,bps_wr_max:l?,iops_max:l?,iops_rd_max:l?,iops_wr_max:l?,bps_max_length:l?,bps_rd_max_length:l?,bps_wr_max_length:l?,iops_max_length:l?,iops_rd_max_length:l?,iops_wr_max_length:l?,iops_size:l?,group:s?",
.mhandler.cmd_new = qmp_marshal_block_set_io_throttle,
},
@@ -2096,7 +2096,9 @@ Change I/O throttle limits for a block drive.
Arguments:
-- "device": device name (json-string)
+- "device": block device name (deprecated, use @id instead)
+ (json-string, optional)
+- "id": the name or QOM path of the guest device (json-string, optional)
- "bps": total throughput limit in bytes per second (json-int)
- "bps_rd": read throughput limit in bytes per second (json-int)
- "bps_wr": write throughput limit in bytes per second (json-int)
--
1.8.3.1
- [Qemu-block] [PATCH 00/10] block: Accept qdev IDs in device level QMP commands, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 01/10] block: Add blk_by_dev(), Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 05/10] block: Accept device model name for x-blockdev-insert-medium, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 02/10] qdev-monitor: Factor out find_device_state(), Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 06/10] block: Accept device model name for x-blockdev-remove-medium, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 04/10] block: Accept device model name for blockdev-open/close-tray, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 03/10] qdev-monitor: Add blk_by_qdev_id(), Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 07/10] block: Accept device model name for eject, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 10/10] qemu-iotests/118: Test media change with qdev name, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 08/10] block: Accept device model name for blockdev-change-medium, Kevin Wolf, 2016/08/19
- [Qemu-block] [PATCH 09/10] block: Accept device model name for block_set_io_throttle,
Kevin Wolf <=