From 9318121db83f8c8151d88bf7de72774decc2b544 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Thu, 24 Jul 2014 13:43:47 +0200 Subject: [PATCH] remove range checking for blkiotune weight This was changed before: https://www.redhat.com/archives/libvir-list/2013-October/msg00525.html but not everywhere in the code. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1100769 Signed-off-by: Martin Kletzander --- src/lxc/lxc_driver.c | 14 -------------- src/qemu/qemu_driver.c | 14 -------------- tools/virsh-domain.c | 2 +- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ecd90537a8..9e12ecc012 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2559,13 +2559,6 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = ¶ms[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("out of blkio weight range.")); - ret = -1; - continue; - } - if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || @@ -2660,13 +2653,6 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = ¶ms[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("out of blkio weight range.")); - ret = -1; - continue; - } - persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 06d3f538b6..be622af6c0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7819,13 +7819,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = ¶ms[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("out of blkio weight range.")); - ret = -1; - continue; - } - if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || @@ -7920,13 +7913,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = ¶ms[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("out of blkio weight range.")); - ret = -1; - continue; - } - persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6fcfd9c4d5..ad68aabf49 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1255,7 +1255,7 @@ static const vshCmdOptDef opts_blkiotune[] = { }, {.name = "weight", .type = VSH_OT_INT, - .help = N_("IO Weight in range [100, 1000]") + .help = N_("IO Weight") }, {.name = "device-weights", .type = VSH_OT_STRING,