vircgroup: add virCgroupGetCpuPeriodQuota()

Another vircgroup helper to avoid code repetition between
the LXC and QEMU driver.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bcdb8728cc2985d3a2588d59415e1e2e6aa8172b..28a3553bcf6afdb22215ec92b6436476ba8c3521 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1693,6 +1693,7 @@ virCgroupGetCpuacctStat;
 virCgroupGetCpuacctUsage;
 virCgroupGetCpuCfsPeriod;
 virCgroupGetCpuCfsQuota;
+virCgroupGetCpuPeriodQuota;
 virCgroupGetCpusetCpus;
 virCgroupGetCpusetMemoryMigrate;
 virCgroupGetCpusetMems;

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index fc559d736a0dacca25b08df91b620fd2962e9b11..b2e9bc3a46d8ff33a09219732d556d59f4b2da21 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1783,13 +1783,7 @@ static int
 lxcGetVcpuBWLive(virCgroupPtr cgroup, unsigned long long *period,
                  long long *quota)
 {
-    if (virCgroupGetCpuCfsPeriod(cgroup, period) < 0)
-        return -1;
-
-    if (virCgroupGetCpuCfsQuota(cgroup, quota) < 0)
-        return -1;
-
-    return 0;
+    return virCgroupGetCpuPeriodQuota(cgroup, period, quota);
 }
 
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2e93fa8f90e6fc84ae1eb8756fafe1d922c94c1c..ef7838a3afdb4d75909641015302ea84790c97f1 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10532,13 +10532,7 @@ static int
 qemuGetVcpuBWLive(virCgroupPtr cgroup, unsigned long long *period,
                   long long *quota)
 {
-    if (virCgroupGetCpuCfsPeriod(cgroup, period) < 0)
-        return -1;
-
-    if (virCgroupGetCpuCfsQuota(cgroup, quota) < 0)
-        return -1;
-
-    return 0;
+    return virCgroupGetCpuPeriodQuota(cgroup, period, quota);
 }
 
 static int

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 1f853beb7371433292aa30a7834f0750269ac3ea..70d85200cb792a042eae3a9eca93b0252c87a280 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -3739,3 +3739,17 @@ virCgroupSetupCpuPeriodQuota(virCgroupPtr cgroup,
 
     return -1;
 }
+
+
+int
+virCgroupGetCpuPeriodQuota(virCgroupPtr cgroup, unsigned long long *period,
+                           long long *quota)
+{
+    if (virCgroupGetCpuCfsPeriod(cgroup, period) < 0)
+        return -1;
+
+    if (virCgroupGetCpuCfsQuota(cgroup, quota) < 0)
+        return -1;
+
+    return 0;
+}

diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index cc53bae258fc55af8a3e814aabef1b254a6db531..a5bd35586dd94ab6f51acbc18e8cdec61161dd4a 100644 (file)
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -227,6 +227,8 @@ int virCgroupSetupCpuShares(virCgroupPtr cgroup, unsigned long long shares,
 
 int virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period);
 int virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period);
+int virCgroupGetCpuPeriodQuota(virCgroupPtr cgroup, unsigned long long *period,
+                               long long *quota);
 int virCgroupSetupCpuPeriodQuota(virCgroupPtr cgroup, unsigned long long period,
                                  long long quota);