| Message ID | 20190312173025.3843-4-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,01/28] gluster: Handle changed glfs_ftruncate signature | expand |
12.03.2019 20:30, Kevin Wolf wrote: > From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Signed-off-by: Kevin Wolf <kwolf@redhat.com> Not critical, but it is v4, when in v5 description and examples were fixed to be s/device/id. I'll send a follow-up. > --- > qapi/block-core.json | 4 ++-- > blockdev.c | 12 ++++++------ > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 919d0530b2..3f0a5cb1e8 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -550,7 +550,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 name or QOM path of the guest device. > # > # @boundaries: list of interval boundary values (see description in > # BlockLatencyHistogramInfo definition). If specified, all > @@ -608,7 +608,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 871966ca13..850fb34c52 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -4453,21 +4453,21 @@ 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); > + BlockBackend *blk = qmp_get_blk(NULL, id, errp); > BlockAcctStats *stats; > int ret; > > if (!blk) { > - error_setg(errp, "Device '%s' not found", device); > return; > } > + > stats = blk_get_stats(blk); > > if (!has_boundaries && !has_boundaries_read && !has_boundaries_write && > @@ -4482,7 +4482,7 @@ void qmp_x_block_latency_histogram_set( > stats, BLOCK_ACCT_READ, > has_boundaries_read ? boundaries_read : boundaries); > if (ret) { > - error_setg(errp, "Device '%s' set read boundaries fail", device); > + error_setg(errp, "Device '%s' set read boundaries fail", id); > return; > } > } > @@ -4492,7 +4492,7 @@ void qmp_x_block_latency_histogram_set( > stats, BLOCK_ACCT_WRITE, > has_boundaries_write ? boundaries_write : boundaries); > if (ret) { > - error_setg(errp, "Device '%s' set write boundaries fail", device); > + error_setg(errp, "Device '%s' set write boundaries fail", id); > return; > } > } > @@ -4502,7 +4502,7 @@ void qmp_x_block_latency_histogram_set( > stats, BLOCK_ACCT_FLUSH, > has_boundaries_flush ? boundaries_flush : boundaries); > if (ret) { > - error_setg(errp, "Device '%s' set flush boundaries fail", device); > + error_setg(errp, "Device '%s' set flush boundaries fail", id); > return; > } > } >
Am 14.03.2019 um 09:47 hat Vladimir Sementsov-Ogievskiy geschrieben: > 12.03.2019 20:30, Kevin Wolf wrote: > > From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > > Not critical, but it is v4, when in v5 description and examples were > fixed to be s/device/id. I'll send a follow-up. Oops, sorry. Thanks for noticing and sending a follow-up so quickly. Kevin
diff --git a/qapi/block-core.json b/qapi/block-core.json index 919d0530b2..3f0a5cb1e8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -550,7 +550,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 name or QOM path of the guest device. # # @boundaries: list of interval boundary values (see description in # BlockLatencyHistogramInfo definition). If specified, all @@ -608,7 +608,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 871966ca13..850fb34c52 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4453,21 +4453,21 @@ 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); + BlockBackend *blk = qmp_get_blk(NULL, id, errp); BlockAcctStats *stats; int ret; if (!blk) { - error_setg(errp, "Device '%s' not found", device); return; } + stats = blk_get_stats(blk); if (!has_boundaries && !has_boundaries_read && !has_boundaries_write && @@ -4482,7 +4482,7 @@ void qmp_x_block_latency_histogram_set( stats, BLOCK_ACCT_READ, has_boundaries_read ? boundaries_read : boundaries); if (ret) { - error_setg(errp, "Device '%s' set read boundaries fail", device); + error_setg(errp, "Device '%s' set read boundaries fail", id); return; } } @@ -4492,7 +4492,7 @@ void qmp_x_block_latency_histogram_set( stats, BLOCK_ACCT_WRITE, has_boundaries_write ? boundaries_write : boundaries); if (ret) { - error_setg(errp, "Device '%s' set write boundaries fail", device); + error_setg(errp, "Device '%s' set write boundaries fail", id); return; } } @@ -4502,7 +4502,7 @@ void qmp_x_block_latency_histogram_set( stats, BLOCK_ACCT_FLUSH, has_boundaries_flush ? boundaries_flush : boundaries); if (ret) { - error_setg(errp, "Device '%s' set flush boundaries fail", device); + error_setg(errp, "Device '%s' set flush boundaries fail", id); return; } }