提交 783584b5 编写于 作者: P Peter Krempa

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.
上级 9958422d
...@@ -18965,7 +18965,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, ...@@ -18965,7 +18965,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
for (i = 0; i < virDomainDefGetVcpus(dom->def); i++) { for (i = 0; i < virDomainDefGetVcpus(dom->def); i++) {
snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
"vcpu.%zu.state", i); "vcpu.%u.state", cpuinfo[i].number);
if (virTypedParamsAddInt(&record->params, if (virTypedParamsAddInt(&record->params,
&record->nparams, &record->nparams,
maxparams, maxparams,
...@@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, ...@@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
continue; continue;
snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
"vcpu.%zu.time", i); "vcpu.%u.time", cpuinfo[i].number);
if (virTypedParamsAddULLong(&record->params, if (virTypedParamsAddULLong(&record->params,
&record->nparams, &record->nparams,
maxparams, maxparams,
...@@ -18986,7 +18986,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, ...@@ -18986,7 +18986,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
cpuinfo[i].cpuTime) < 0) cpuinfo[i].cpuTime) < 0)
goto cleanup; goto cleanup;
snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
"vcpu.%zu.wait", i); "vcpu.%u.wait", cpuinfo[i].number);
if (virTypedParamsAddULLong(&record->params, if (virTypedParamsAddULLong(&record->params,
&record->nparams, &record->nparams,
maxparams, maxparams,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册