[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 1/2] qapi: move to QOM path for x-block-latency-h
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v2 1/2] qapi: move to QOM path for x-block-latency-histogram-set |
Date: |
Fri, 12 Oct 2018 16:15:08 +0300 |
Move to way of device selecting, however fall back to device name if
path is not found.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
qapi/block-core.json | 4 ++--
blockdev.c | 16 ++++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index cfb37f8c1d..f4ae61e2e4 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -489,7 +489,7 @@
# If only @device parameter is specified, remove all present latency histograms
# for the device. Otherwise, add/reset some of (or all) latency histograms.
#
-# @device: device name to set latency histogram for.
+# @id: The QOM path or name of the guest device.
#
# @boundaries: list of interval boundary values (see description in
# BlockLatencyHistogramInfo definition). If specified, all
@@ -547,7 +547,7 @@
# <- { "return": {} }
##
{ 'command': 'x-block-latency-histogram-set',
- 'data': {'device': 'str',
+ 'data': {'id': 'str',
'*boundaries': ['uint64'],
'*boundaries-read': ['uint64'],
'*boundaries-write': ['uint64'],
diff --git a/blockdev.c b/blockdev.c
index a8755bd908..52e131f47b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -4368,20 +4368,28 @@ void qmp_x_blockdev_set_iothread(const char *node_name,
StrOrNull *iothread,
}
void qmp_x_block_latency_histogram_set(
- const char *device,
+ const char *id,
bool has_boundaries, uint64List *boundaries,
bool has_boundaries_read, uint64List *boundaries_read,
bool has_boundaries_write, uint64List *boundaries_write,
bool has_boundaries_flush, uint64List *boundaries_flush,
Error **errp)
{
- BlockBackend *blk = blk_by_name(device);
BlockAcctStats *stats;
+ Error *local_err = NULL;
+ BlockBackend *blk = blk_by_qdev_id(id, &local_err);
if (!blk) {
- error_setg(errp, "Device '%s' not found", device);
- return;
+ blk = blk_by_name(id);
+ if (!blk) {
+ error_propagate(errp, local_err);
+ return;
+ } else {
+ error_free(local_err);
+ local_err = NULL;
+ }
}
+
stats = blk_get_stats(blk);
if (!has_boundaries && !has_boundaries_read && !has_boundaries_write &&
--
2.18.0