External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vz: support cpu time in driver's domainGetInfo

Browse Source 
Just straight-forward patch.
Use reference counting for privdom as stats internally could drop domain lock.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2015-10-28 17:29:00 +03:00 committed by Dmitry Guryanov
parent f8ea21c95d
commit db92aee2b4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vz/vz_driver.c
View File

@ -554,7 +554,7 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
virDomainObjPtr privdom; virDomainObjPtr privdom;
int ret = -1; int ret = -1;
if (!(privdom = vzDomObjFromDomain(domain))) if (!(privdom = vzDomObjFromDomainRef(domain)))
goto cleanup; goto cleanup;
info->state = virDomainObjGetState(privdom, NULL); info->state = virDomainObjGetState(privdom, NULL);
@ -562,11 +562,24 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
info->maxMem = virDomainDefGetMemoryActual(privdom->def); info->maxMem = virDomainDefGetMemoryActual(privdom->def);
info->nrVirtCpu = privdom->def->vcpus; info->nrVirtCpu = privdom->def->vcpus;
info->cpuTime = 0; info->cpuTime = 0;
if (virDomainObjIsActive(privdom)) {
unsigned long long vtime;
size_t i;
for (i = 0; i < privdom->def->vcpus; ++i) {
if (prlsdkGetVcpuStats(privdom, i, &vtime) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot read cputime for domain"));
goto cleanup;
}
info->cpuTime += vtime;
}
}
ret = 0; ret = 0;
cleanup: cleanup:
if (privdom) virDomainObjEndAPI(&privdom);
virObjectUnlock(privdom);
return ret; return ret;
} }