Whole-process monitors have no vCPU list. Leave the collected vcpus value unset and omit the typed parameter for cache, memory bandwidth, and energy stats instead of reporting an empty string.
Signed-off-by: Jedrzej Wasiukiewicz <[email protected]> Reviewed-by: Christopher M. Cantalupo <[email protected]> --- src/qemu/qemu_driver.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8498568623..9159c769fe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17410,11 +17410,10 @@ qemuDomainGetResctrlMonData(virQEMUDriver *driver, res = g_new0(virQEMUResctrlMonData, 1); - /* 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); + /* Leave res->vcpus NULL for a whole-process monitor; formatting + * its empty bitmap would report an empty vcpus field. */ + if (!domresmon->whole_process) + res->vcpus = virBitmapFormat(domresmon->vcpus); res->name = virResctrlMonitorGetName(monitor); if (virResctrlMonitorGetStats(monitor, (const char **)features, @@ -17464,8 +17463,9 @@ 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); + 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); @@ -17529,8 +17529,9 @@ 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); + 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); @@ -17586,8 +17587,9 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, 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); + 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.
