From 2fb78d18ea95c2dcb4c5b0e29171636e51bb2149 Mon Sep 17 00:00:00 2001 Message-Id: <2fb78d18ea95c2dcb4c5b0e29171636e51bb2149@dist-git> From: Pavel Hrdina Date: Thu, 21 Jan 2021 10:24:04 -0300 Subject: [PATCH] vircgroupv1: use defines for cpu period and quota limits Signed-off-by: Pavel Hrdina Reviewed-by: Daniel Henrique Barboza (cherry picked from commit bc760f4d7c4f964fadcb2a73e126b0053e7a9b06) https://bugzilla.redhat.com/1915733 Signed-off-by: Daniel Henrique Barboza Message-Id: <20210121132406.337681-3-dbarboza@redhat.com> Reviewed-by: Pavel Hrdina --- src/util/vircgroupv1.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index d2ec7106db..c35088a3c4 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1869,13 +1869,13 @@ static int virCgroupV1SetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) { - /* The cfs_period should be greater or equal than 1ms, and less or equal - * than 1s. - */ - if (cfs_period < 1000 || cfs_period > 1000000) { + if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || + cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_period '%llu' must be in range (1000, 1000000)"), - cfs_period); + _("cfs_period '%llu' must be in range (%llu, %llu)"), + cfs_period, + VIR_CGROUP_CPU_PERIOD_MIN, + VIR_CGROUP_CPU_PERIOD_MAX); return -1; } @@ -1899,13 +1899,14 @@ static int virCgroupV1SetCpuCfsQuota(virCgroupPtr group, long long cfs_quota) { - /* The cfs_quota should be greater or equal than 1ms */ if (cfs_quota >= 0 && - (cfs_quota < 1000 || - cfs_quota > ULLONG_MAX / 1000)) { + (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || + cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_quota '%lld' must be in range (1000, %llu)"), - cfs_quota, ULLONG_MAX / 1000); + _("cfs_quota '%lld' must be in range (%llu, %llu)"), + cfs_quota, + VIR_CGROUP_CPU_QUOTA_MIN, + VIR_CGROUP_CPU_QUOTA_MAX); return -1; } -- 2.30.0