mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-01 06:42:22 +00:00
qemuDomainGetStatsCpuProc: Remove return value
The function can't fail. Remove return value and refactor callers. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
a90df14a35
commit
acad77f04b
@ -16834,7 +16834,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static void
|
||||||
qemuDomainGetStatsCpuProc(virDomainObj *vm,
|
qemuDomainGetStatsCpuProc(virDomainObj *vm,
|
||||||
virTypedParamList *params)
|
virTypedParamList *params)
|
||||||
{
|
{
|
||||||
@ -16845,14 +16845,12 @@ qemuDomainGetStatsCpuProc(virDomainObj *vm,
|
|||||||
if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime,
|
if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime,
|
||||||
NULL, NULL, vm->pid, 0) < 0) {
|
NULL, NULL, vm->pid, 0) < 0) {
|
||||||
/* ignore error */
|
/* ignore error */
|
||||||
return 0;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
virTypedParamListAddULLong(params, cpuTime, "cpu.time");
|
virTypedParamListAddULLong(params, cpuTime, "cpu.time");
|
||||||
virTypedParamListAddULLong(params, userTime, "cpu.user");
|
virTypedParamListAddULLong(params, userTime, "cpu.user");
|
||||||
virTypedParamListAddULLong(params, sysTime, "cpu.system");
|
virTypedParamListAddULLong(params, sysTime, "cpu.system");
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -16955,8 +16953,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
|
|||||||
if (priv->cgroup) {
|
if (priv->cgroup) {
|
||||||
qemuDomainGetStatsCpuCgroup(dom, params);
|
qemuDomainGetStatsCpuCgroup(dom, params);
|
||||||
} else {
|
} else {
|
||||||
if (qemuDomainGetStatsCpuProc(dom, params) < 0)
|
qemuDomainGetStatsCpuProc(dom, params);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
|
if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user