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

qemu: Use virBitmapToDataBuf in qemuDomainGetVcpuPinInfo

Browse Source 
Reuse the function so that we can get rid of a lot of temporary
allocations.
This commit is contained in:
Peter Krempa 2015-05-22 11:07:21 +02:00
parent 02a6c73f27
commit b6d438e10c
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_driver.c
View File

@ -5291,8 +5291,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
virDomainDefPtr targetDef = NULL; virDomainDefPtr targetDef = NULL;
int ret = -1; int ret = -1;
int hostcpus, vcpu; int hostcpus, vcpu;
unsigned char *cpumap;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
virBitmapPtr allcpumap = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1); VIR_DOMAIN_AFFECT_CONFIG, -1);
@ -5319,6 +5319,11 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
if ((hostcpus = nodeGetCPUCount()) < 0) if ((hostcpus = nodeGetCPUCount()) < 0)
goto cleanup; goto cleanup;
if (!(allcpumap = virBitmapNew(hostcpus)))
goto cleanup;
virBitmapSetAll(allcpumap);
/* Clamp to actual number of vcpus */ /* Clamp to actual number of vcpus */
if (ncpumaps > targetDef->vcpus) if (ncpumaps > targetDef->vcpus)
ncpumaps = targetDef->vcpus; ncpumaps = targetDef->vcpus;
@ -5329,37 +5334,23 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
for (vcpu = 0; vcpu < ncpumaps; vcpu++) { for (vcpu = 0; vcpu < ncpumaps; vcpu++) {
virDomainPinDefPtr pininfo; virDomainPinDefPtr pininfo;
virBitmapPtr bitmap = NULL; virBitmapPtr bitmap = NULL;
unsigned char *tmpmap = NULL;
int tmpmaplen;
pininfo = virDomainPinFind(targetDef->cputune.vcpupin, pininfo = virDomainPinFind(targetDef->cputune.vcpupin,
targetDef->cputune.nvcpupin, targetDef->cputune.nvcpupin,
vcpu); vcpu);
if (!pininfo) {
if (!(bitmap = virBitmapNew(hostcpus)))
goto cleanup;
virBitmapSetAll(bitmap);
} else {
bitmap = pininfo->cpumask;
}
if (virBitmapToData(bitmap, &tmpmap, &tmpmaplen) < 0) { if (pininfo && pininfo->cpumask)
if (!pininfo) bitmap = pininfo->cpumask;
virBitmapFree(bitmap); else
goto cleanup; bitmap = allcpumap;
}
if (tmpmaplen > maplen) virBitmapToDataBuf(bitmap, VIR_GET_CPUMAP(cpumaps, maplen, vcpu), maplen);
tmpmaplen = maplen;
cpumap = VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
memcpy(cpumap, tmpmap, tmpmaplen);
if (!pininfo)
virBitmapFree(bitmap);
VIR_FREE(tmpmap);
} }
ret = ncpumaps; ret = ncpumaps;
cleanup: cleanup:
virBitmapFree(allcpumap);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps); virObjectUnref(caps);
return ret; return ret;