[PATCH 13/21] qemuDomainGetStatsCpuProc: Remove return value

Peter Krempa posted 21 patches 9 months, 4 weeks ago
[PATCH 13/21] qemuDomainGetStatsCpuProc: Remove return value
Posted by Peter Krempa 9 months, 4 weeks ago
The function can't fail. Remove return value and refactor callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/qemu/qemu_driver.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1b5e7b1d70..a93899ceb5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16834,7 +16834,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
 }


-static int
+static void
 qemuDomainGetStatsCpuProc(virDomainObj *vm,
                           virTypedParamList *params)
 {
@@ -16845,14 +16845,12 @@ qemuDomainGetStatsCpuProc(virDomainObj *vm,
     if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime,
                               NULL, NULL, vm->pid, 0) < 0) {
         /* ignore error */
-        return 0;
+        return;
     }

     virTypedParamListAddULLong(params, cpuTime, "cpu.time");
     virTypedParamListAddULLong(params, userTime, "cpu.user");
     virTypedParamListAddULLong(params, sysTime, "cpu.system");
-
-    return 0;
 }


@@ -16955,8 +16953,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
     if (priv->cgroup) {
         qemuDomainGetStatsCpuCgroup(dom, params);
     } else {
-        if (qemuDomainGetStatsCpuProc(dom, params) < 0)
-            return -1;
+        qemuDomainGetStatsCpuProc(dom, params);
     }

     if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
-- 
2.48.1