The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- 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 d486169bc8..1b5e7b1d70 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16812,7 +16812,7 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, } -static int +static void qemuDomainGetStatsCpuCgroup(virDomainObj *dom, virTypedParamList *params) { @@ -16822,7 +16822,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, unsigned long long sys_time = 0; if (!priv->cgroup) - return 0; + return; if (virCgroupGetCpuacctUsage(priv->cgroup, &cpu_time) == 0) virTypedParamListAddULLong(params, cpu_time, "cpu.time"); @@ -16831,8 +16831,6 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, virTypedParamListAddULLong(params, user_time, "cpu.user"); virTypedParamListAddULLong(params, sys_time, "cpu.system"); } - - return 0; } @@ -16955,8 +16953,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, qemuDomainObjPrivate *priv = dom->privateData; if (priv->cgroup) { - if (qemuDomainGetStatsCpuCgroup(dom, params) < 0) - return -1; + qemuDomainGetStatsCpuCgroup(dom, params); } else { if (qemuDomainGetStatsCpuProc(dom, params) < 0) return -1; -- 2.48.1