From acad77f04bb6536eb4e6ffcd325df746fb25c29a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 17 Feb 2025 13:51:10 +0100 Subject: [PATCH] qemuDomainGetStatsCpuProc: Remove return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik Reviewed-by: Ján Tomko --- 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)