shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

qemu: driver: Refactor qemuDomainHelperGetVcpus

Browse Source 
Change some of the control structures and switch to using the new vcpu
structure.
This commit is contained in:
Peter Krempa 2015-11-20 16:02:54 +01:00
parent e6b36736a8
commit ce43cca0eb
1 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/qemu/qemu_driver.c
View File

@ -1422,11 +1422,17 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss,
static int static int
qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, qemuDomainHelperGetVcpus(virDomainObjPtr vm,
unsigned char *cpumaps, int maplen) virVcpuInfoPtr info,
int maxinfo,
unsigned char *cpumaps,
int maplen)
{ {
size_t i, v; size_t ncpuinfo = 0;
qemuDomainObjPrivatePtr priv = vm->privateData; size_t i;
if (maxinfo == 0)
return 0;
if (!qemuDomainHasVcpuPids(vm)) { if (!qemuDomainHasVcpuPids(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
@ -1434,43 +1440,46 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo,
return -1; return -1;
} }
/* Clamp to actual number of vcpus */ if (info)
if (maxinfo > priv->nvcpupids) memset(info, 0, sizeof(*info) * maxinfo);
maxinfo = priv->nvcpupids;
if (maxinfo >= 1) { if (cpumaps)
if (info != NULL) { memset(cpumaps, 0, sizeof(*cpumaps) * maxinfo);
memset(info, 0, sizeof(*info) * maxinfo);
for (i = 0; i < maxinfo; i++) {
info[i].number = i;
info[i].state = VIR_VCPU_RUNNING;
if (qemuGetProcessInfo(&(info[i].cpuTime), for (i = 0; i < virDomainDefGetVcpusMax(vm->def) && ncpuinfo < maxinfo; i++) {
&(info[i].cpu), virDomainVcpuInfoPtr vcpu = virDomainDefGetVcpu(vm->def, i);
NULL, pid_t vcpupid = qemuDomainGetVcpuPid(vm, i);
vm->pid,
qemuDomainGetVcpuPid(vm, i)) < 0) { if (!vcpu->online)
virReportSystemError(errno, "%s", continue;
_("cannot get vCPU placement & pCPU time"));
return -1; if (info) {
} info[i].number = i;
info[i].state = VIR_VCPU_RUNNING;
if (qemuGetProcessInfo(&(info[i].cpuTime), &(info[i].cpu), NULL,
vm->pid, vcpupid) < 0) {
virReportSystemError(errno, "%s",
_("cannot get vCPU placement & pCPU time"));
return -1;
} }
} }
if (cpumaps != NULL) { if (cpumaps) {
for (v = 0; v < maxinfo; v++) { unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, i);
unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); virBitmapPtr map = NULL;
virBitmapPtr map = NULL;
if (!(map = virProcessGetAffinity(qemuDomainGetVcpuPid(vm, v)))) if (!(map = virProcessGetAffinity(vcpupid)))
return -1; return -1;
virBitmapToDataBuf(map, cpumap, maplen); virBitmapToDataBuf(map, cpumap, maplen);
virBitmapFree(map); virBitmapFree(map);
}
} }
ncpuinfo++;
} }
return maxinfo;
return ncpuinfo;
} }