From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> Since 2.6.39, kernel changed the minimum weight of device blkio. Update related docs. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- docs/formatdomain.html.in | 6 ++++-- tools/virsh.pod | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3689399..6458567 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -772,7 +772,8 @@ <dt><code>weight</code></dt> <dd> The optional <code>weight</code> element is the overall I/O weight of the guest. The value should be in the range [100, - 1000].</dd> + 1000]. After kernel 2.6.39, the value could be in the + range [10, 1000].</dd> <dt><code>device</code></dt> <dd>The domain may have multiple <code>device</code> elements that further tune the weights for each host block device in @@ -789,7 +790,8 @@ mandatory sub-elements, <code>path</code> describing the absolute path of the device, and <code>weight</code> giving the relative weight of that device, in the range [100, - 1000]. <span class="since">Since 0.9.8</span></dd> + 1000]. After kernel 2.6.39, the value could be in the + range [10, 1000].<span class="since">Since 0.9.8</span></dd> </dl> diff --git a/tools/virsh.pod b/tools/virsh.pod index e12a800..4114ab6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1623,14 +1623,15 @@ Specifying -1 as a value for these limits is interpreted as unlimited. [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. -I<--weight> is in range [100, 1000]. +I<--weight> is in range [100, 1000]. After kernel 2.6.39, the value +could be in the range [10, 1000]. B<device-weights> is a single string listing one or more device/weight pairs, in the format of /path/to/device,weight,/path/to/device,weight. -Each weight is in the range [100, 1000], or the value 0 to remove that -device from per-device listings. Only the devices listed in the string -are modified; any existing per-device weights for other devices remain -unchanged. +Each weight is in the range [100, 1000], [10, 1000] after kernel 2.6.39, +or the value 0 to remove that device from per-device listings. +Only the devices listed in the string are modified; +any existing per-device weights for other devices remain unchanged. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. -- 1.8.2.1

From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> When EINVAL caught, tell user that what values are invalid for what field. Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- src/util/vircgroup.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..a98bd63 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -664,12 +664,21 @@ virCgroupSetValueStr(virCgroupPtr group, { int ret = -1; char *keypath = NULL; + char *tmp = NULL; if (virCgroupPathOfController(group, controller, key, &keypath) < 0) return -1; VIR_DEBUG("Set value '%s' to '%s'", keypath, value); if (virFileWriteStr(keypath, value, 0) < 0) { + if (errno == EINVAL) { + tmp = strrchr(keypath, '/'); + if (!tmp) + goto cleanup; + virReportSystemError(errno, + _("Invalid value '%s' for '%s'"), value, ++tmp); + goto cleanup; + } virReportSystemError(errno, _("Unable to write to '%s'"), keypath); goto cleanup; @@ -1829,7 +1838,8 @@ virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight) * * @group: The cgroup to change io device weight device for * @path: The device with a weight to alter - * @weight: The new device weight (100-1000), or 0 to clear + * @weight: The new device weight (100-1000), + * (10-1000) after kernel 2.6.39, or 0 to clear * * device_weight is treated as a write-only parameter, so * there isn't a getter counterpart. -- 1.8.2.1