From 783584b52b3ddeea2b0bf46dc1e20455d3877dc8 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 12 Feb 2016 08:24:07 +0100 Subject: [PATCH] qemu: qemuDomainGetStatsVcpu: Fix output for possible sparse vCPU settings qemuDomainHelperGetVcpus would correctly return an array of virVcpuInfoPtr structs for online vcpus even for sparse topologies, but the loop that fills the returned typed parameters would number the vcpus incorrectly. Fortunately sparse topologies aren't supported yet. --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d1e51889bc..b1f94bd24d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18965,7 +18965,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, for (i = 0; i < virDomainDefGetVcpus(dom->def); i++) { snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "vcpu.%zu.state", i); + "vcpu.%u.state", cpuinfo[i].number); if (virTypedParamsAddInt(&record->params, &record->nparams, maxparams, @@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, continue; snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "vcpu.%zu.time", i); + "vcpu.%u.time", cpuinfo[i].number); if (virTypedParamsAddULLong(&record->params, &record->nparams, maxparams, @@ -18986,7 +18986,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, cpuinfo[i].cpuTime) < 0) goto cleanup; snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "vcpu.%zu.wait", i); + "vcpu.%u.wait", cpuinfo[i].number); if (virTypedParamsAddULLong(&record->params, &record->nparams, maxparams,