External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-28 22:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainGetStats: Convert worker functions to void

Browse Source 
The presence of a return value made it seem that it's expected to fail
on errors which is not the case. The function is designed to skip
anything it can't fill and not fail when fetching individual stats.

Convert the workers to void to make it clear that it's expected not
to fail.

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:
Peter Krempa 2025-02-17 14:33:31 +01:00
parent 4086f9ed5c
commit f0c9c34d58
1 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/qemu/qemu_driver.c
View File

@ -16556,7 +16556,7 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
} }
static int static void
qemuDomainGetStatsState(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsState(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -16564,8 +16564,6 @@ qemuDomainGetStatsState(virQEMUDriver *driver G_GNUC_UNUSED,
{ {
virTypedParamListAddInt(params, dom->state.state, "state.state"); virTypedParamListAddInt(params, dom->state.state, "state.state");
virTypedParamListAddInt(params, dom->state.reason, "state.reason"); virTypedParamListAddInt(params, dom->state.reason, "state.reason");
return 0;
} }
@ -16939,7 +16937,7 @@ qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom,
return; return;
} }
static int static void
qemuDomainGetStatsCpu(virQEMUDriver *driver, qemuDomainGetStatsCpu(virQEMUDriver *driver,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -16956,12 +16954,10 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
qemuDomainGetStatsCpuCache(driver, dom, params); qemuDomainGetStatsCpuCache(driver, dom, params);
qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags); qemuDomainGetStatsCpuHaltPollTime(dom, params, privflags);
return 0;
} }
static int static void
qemuDomainGetStatsMemory(virQEMUDriver *driver, qemuDomainGetStatsMemory(virQEMUDriver *driver,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -16969,11 +16965,10 @@ qemuDomainGetStatsMemory(virQEMUDriver *driver,
{ {
qemuDomainGetStatsMemoryBandwidth(driver, dom, params); qemuDomainGetStatsMemoryBandwidth(driver, dom, params);
return 0;
} }
static int static void
qemuDomainGetStatsBalloon(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsBalloon(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -16994,12 +16989,12 @@ qemuDomainGetStatsBalloon(virQEMUDriver *driver G_GNUC_UNUSED,
virTypedParamListAddULLong(params, virDomainDefGetMemoryTotal(dom->def), "balloon.maximum"); virTypedParamListAddULLong(params, virDomainDefGetMemoryTotal(dom->def), "balloon.maximum");
if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
return 0; return;
nr_stats = qemuDomainMemoryStatsInternal(dom, stats, nr_stats = qemuDomainMemoryStatsInternal(dom, stats,
VIR_DOMAIN_MEMORY_STAT_NR); VIR_DOMAIN_MEMORY_STAT_NR);
if (nr_stats < 0) if (nr_stats < 0)
return 0; return;
#define STORE_MEM_RECORD(TAG, NAME) \ #define STORE_MEM_RECORD(TAG, NAME) \
if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ ##TAG) \ if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ ##TAG) \
@ -17021,8 +17016,6 @@ qemuDomainGetStatsBalloon(virQEMUDriver *driver G_GNUC_UNUSED,
} }
#undef STORE_MEM_RECORD #undef STORE_MEM_RECORD
return 0;
} }
@ -17085,7 +17078,7 @@ qemuDomainAddStatsFromHashTable(GHashTable *stats,
} }
static int static void
qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17118,7 +17111,7 @@ qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainDefGetVcpus(dom->def), virDomainDefGetVcpus(dom->def),
NULL, 0) < 0) { NULL, 0) < 0) {
virResetLastError(); virResetLastError();
return 0; return;
} }
if (HAVE_JOB(privflags) && qemuDomainRefreshStatsSchema(dom) == 0) { if (HAVE_JOB(privflags) && qemuDomainRefreshStatsSchema(dom) == 0) {
@ -17163,15 +17156,13 @@ qemuDomainGetStatsVcpu(virQEMUDriver *driver G_GNUC_UNUSED,
qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, prefix, params); qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, prefix, params);
} }
return 0;
} }
#define QEMU_ADD_NET_PARAM(params, num, name, value) \ #define QEMU_ADD_NET_PARAM(params, num, name, value) \
if (value >= 0)\ if (value >= 0)\
virTypedParamListAddULLong((params), (value), "net.%zu.%s", (num), (name)); virTypedParamListAddULLong((params), (value), "net.%zu.%s", (num), (name));
static int static void
qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17180,7 +17171,7 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED,
size_t i; size_t i;
if (!virDomainObjIsActive(dom)) if (!virDomainObjIsActive(dom))
return 0; return;
virTypedParamListAddUInt(params, dom->def->nnets, "net.count"); virTypedParamListAddUInt(params, dom->def->nnets, "net.count");
@ -17219,8 +17210,6 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED,
QEMU_ADD_NET_PARAM(params, i, "tx.errs", tmp.tx_errs); QEMU_ADD_NET_PARAM(params, i, "tx.errs", tmp.tx_errs);
QEMU_ADD_NET_PARAM(params, i, "tx.drop", tmp.tx_drop); QEMU_ADD_NET_PARAM(params, i, "tx.drop", tmp.tx_drop);
} }
return 0;
} }
#undef QEMU_ADD_NET_PARAM #undef QEMU_ADD_NET_PARAM
@ -17481,7 +17470,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
} }
static int static void
qemuDomainGetStatsBlock(virQEMUDriver *driver, qemuDomainGetStatsBlock(virQEMUDriver *driver,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17518,12 +17507,10 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,
virTypedParamListAddUInt(params, visited, "block.count"); virTypedParamListAddUInt(params, visited, "block.count");
virTypedParamListConcat(params, &blockparams); virTypedParamListConcat(params, &blockparams);
return 0;
} }
static int static void
qemuDomainGetStatsIOThread(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsIOThread(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17534,17 +17521,17 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver G_GNUC_UNUSED,
int niothreads = 0; int niothreads = 0;
if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
return 0; return;
if (qemuDomainGetIOThreadsMon(dom, &iothreads, &niothreads) < 0) { if (qemuDomainGetIOThreadsMon(dom, &iothreads, &niothreads) < 0) {
virResetLastError(); virResetLastError();
return 0; return;
} }
/* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we must free /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we must free
* it even if it returns 0 */ * it even if it returns 0 */
if (niothreads == 0) if (niothreads == 0)
return 0; return;
virTypedParamListAddUInt(params, niothreads, "iothread.count"); virTypedParamListAddUInt(params, niothreads, "iothread.count");
@ -17564,8 +17551,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver *driver G_GNUC_UNUSED,
for (i = 0; i < niothreads; i++) for (i = 0; i < niothreads; i++)
VIR_FREE(iothreads[i]); VIR_FREE(iothreads[i]);
return 0;
} }
@ -17582,7 +17567,7 @@ qemuDomainGetStatsPerfOneEvent(virPerf *perf,
virTypedParamListAddULLong(params, value, "perf.%s", virPerfEventTypeToString(type)); virTypedParamListAddULLong(params, value, "perf.%s", virPerfEventTypeToString(type));
} }
static int static void
qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17597,12 +17582,10 @@ qemuDomainGetStatsPerf(virQEMUDriver *driver G_GNUC_UNUSED,
qemuDomainGetStatsPerfOneEvent(priv->perf, i, params); qemuDomainGetStatsPerfOneEvent(priv->perf, i, params);
} }
return 0;
} }
static int static void
qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17613,7 +17596,7 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED,
int rv; int rv;
if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
return 0; return;
qemuDomainObjEnterMonitor(dom); qemuDomainObjEnterMonitor(dom);
rv = qemuMonitorQueryDirtyRate(priv->mon, &info); rv = qemuMonitorQueryDirtyRate(priv->mon, &info);
@ -17621,7 +17604,7 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED,
if (rv < 0) { if (rv < 0) {
virResetLastError(); virResetLastError();
return 0; return;
} }
virTypedParamListAddInt(params, info.status, "dirtyrate.calc_status"); virTypedParamListAddInt(params, info.status, "dirtyrate.calc_status");
@ -17642,12 +17625,10 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver G_GNUC_UNUSED,
} }
} }
} }
return 0;
} }
static int static void
qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC_UNUSED,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *params, virTypedParamList *params,
@ -17659,10 +17640,10 @@ qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC_UNUSED,
virJSONValue *stats_obj = NULL; virJSONValue *stats_obj = NULL;
if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
return 0; return;
if (qemuDomainRefreshStatsSchema(dom) < 0) if (qemuDomainRefreshStatsSchema(dom) < 0)
return 0; return;
qemuDomainObjEnterMonitor(dom); qemuDomainObjEnterMonitor(dom);
queried_stats = qemuMonitorQueryStats(priv->mon, queried_stats = qemuMonitorQueryStats(priv->mon,
@ -17671,17 +17652,15 @@ qemuDomainGetStatsVm(virQEMUDriver *driver G_GNUC_UNUSED,
qemuDomainObjExitMonitor(dom); qemuDomainObjExitMonitor(dom);
if (!queried_stats || virJSONValueArraySize(queried_stats) != 1) if (!queried_stats || virJSONValueArraySize(queried_stats) != 1)
return 0; return;
stats_obj = virJSONValueArrayGet(queried_stats, 0); stats_obj = virJSONValueArrayGet(queried_stats, 0);
stats = qemuMonitorExtractQueryStats(stats_obj); stats = qemuMonitorExtractQueryStats(stats_obj);
qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, "vm", params); qemuDomainAddStatsFromHashTable(stats, priv->statsSchema, "vm", params);
return 0;
} }
typedef int typedef void
(*qemuDomainGetStatsFunc)(virQEMUDriver *driver, (*qemuDomainGetStatsFunc)(virQEMUDriver *driver,
virDomainObj *dom, virDomainObj *dom,
virTypedParamList *list, virTypedParamList *list,
@ -17795,9 +17774,7 @@ qemuDomainGetStats(virConnectPtr conn,
for (i = 0; qemuDomainGetStatsWorkers[i].func; i++) { for (i = 0; qemuDomainGetStatsWorkers[i].func; i++) {
if (stats & qemuDomainGetStatsWorkers[i].stats) { if (stats & qemuDomainGetStatsWorkers[i].stats) {
if (qemuDomainGetStatsWorkers[i].func(conn->privateData, dom, params, qemuDomainGetStatsWorkers[i].func(conn->privateData, dom, params, flags);
flags) < 0)
return -1;
} }
} }