From f660984273229f2b0ef4a10a2a31c174b7203814 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 17 Feb 2025 13:51:10 +0100 Subject: [PATCH] qemuDomainGetStatsCpuHaltPollTime: Remove return value MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a93899ceb5..e2db449a7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16920,7 +16920,7 @@ qemuDomainGetStatsCpuHaltPollTimeFromStats(virDomainObj *dom, } -static int +static void qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, virTypedParamList *params, unsigned int privflags) @@ -16929,17 +16929,17 @@ qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, unsigned long long haltPollFail = 0; if (!virDomainObjIsActive(dom)) - return 0; + return; if (qemuDomainGetStatsCpuHaltPollTimeFromStats(dom, privflags, &haltPollSuccess, &haltPollFail) < 0 && virHostCPUGetHaltPollTime(dom->pid, &haltPollSuccess, &haltPollFail) < 0) - return 0; + return; virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.success.time"); virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fail.time"); - return 0; + return; } static int @@ -16959,8 +16959,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; - if (qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags) < 0) - return -1; + qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags); return 0; } -- 2.47.3