A whole-process monitor has no vcpu list, so omit the 'vcpus' field entirely for cache, memory bandwidth and energy monitors rather than reporting it as an empty string.
Return early from the cache collector when there are no monitors, so that a monitor count is not reported when there is no data, matching the memory bandwidth and energy collectors. Signed-off-by: Jedrzej Wasiukiewicz <[email protected]> --- src/qemu/qemu_driver.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 689456fd8b..3d1d7b8cb9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17212,8 +17212,10 @@ qemuDomainGetResctrlMonData(virQEMUDriver *driver, /* If virBitmapFormat successfully returns an vcpu string, then * res.vcpus is assigned with an memory space holding it, * let this newly allocated memory buffer to be freed along with - * the free of 'res' */ - res->vcpus = virBitmapFormat(domresmon->vcpus); + * the free of 'res'. Leave vcpus as NULL to signal a whole-process + * monitor. */ + if (!domresmon->whole_process) + res->vcpus = virBitmapFormat(domresmon->vcpus); res->name = virResctrlMonitorGetName(monitor); if (virResctrlMonitorGetStats(monitor, (const char **)features, @@ -17263,8 +17265,10 @@ qemuDomainGetStatsMemoryBandwidth(virQEMUDriver *driver, for (i = 0; i < nresdata; i++) { virTypedParamListAddString(params, resdata[i]->name, VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_SUFFIX_NAME, i); - virTypedParamListAddString(params, resdata[i]->vcpus, - VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_SUFFIX_VCPUS, i); + /* A whole-process monitor has no vcpu list; omit the field entirely. */ + if (resdata[i]->vcpus) + virTypedParamListAddString(params, resdata[i]->vcpus, + VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_SUFFIX_VCPUS, i); virTypedParamListAddUInt(params, resdata[i]->nstats, VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_MEMORY_BANDWIDTH_MONITOR_SUFFIX_NODE_COUNT, i); @@ -17328,8 +17332,10 @@ qemuDomainGetStatsEnergy(virQEMUDriver *driver, virTypedParamListAddString(params, resdata[i]->name, VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_SUFFIX_NAME, i); - virTypedParamListAddString(params, resdata[i]->vcpus, - VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_SUFFIX_VCPUS, i); + /* A whole-process monitor has no vcpu list; omit the field entirely. */ + if (resdata[i]->vcpus) + virTypedParamListAddString(params, resdata[i]->vcpus, + VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_SUFFIX_VCPUS, i); virTypedParamListAddUInt(params, resdata[i]->nstats, VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_ENERGY_MONITOR_SUFFIX_PKG_COUNT, i); @@ -17376,14 +17382,19 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, return; } + if (nresdata == 0) + return; + virTypedParamListAddUInt(params, nresdata, VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_COUNT); for (i = 0; i < nresdata; i++) { virTypedParamListAddString(params, resdata[i]->name, VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_SUFFIX_NAME, i); - virTypedParamListAddString(params, resdata[i]->vcpus, - VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_SUFFIX_VCPUS, i); + /* A whole-process monitor has no vcpu list; omit the field entirely. */ + if (resdata[i]->vcpus) + virTypedParamListAddString(params, resdata[i]->vcpus, + VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_SUFFIX_VCPUS, i); virTypedParamListAddUInt(params, resdata[i]->nstats, VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_PREFIX "%zu" VIR_DOMAIN_STATS_CPU_CACHE_MONITOR_SUFFIX_BANK_COUNT, i); -- 2.43.0 --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.
