NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

libxl: Reuse virBitmapToData in libxlDomainSetVcpuAffinities

Browse Source
This commit is contained in:
Peter Krempa 2015-05-22 09:53:12 +02:00
parent 9f8196ace2
commit 4f3f8ca88b
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libxl/libxl_domain.c
View File

@ -797,34 +797,17 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
libxl_bitmap map; libxl_bitmap map;
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
uint8_t *cpumap = NULL;
virNodeInfo nodeinfo;
size_t cpumaplen;
int vcpu; int vcpu;
size_t i;
int ret = -1; int ret = -1;
if (libxlDriverNodeGetInfo(driver, &nodeinfo) < 0)
goto cleanup;
cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo));
for (vcpu = 0; vcpu < def->cputune.nvcpupin; ++vcpu) { for (vcpu = 0; vcpu < def->cputune.nvcpupin; ++vcpu) {
if (vcpu != def->cputune.vcpupin[vcpu]->id) if (vcpu != def->cputune.vcpupin[vcpu]->id)
continue; continue;
if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
goto cleanup;
cpumask = def->cputune.vcpupin[vcpu]->cpumask; cpumask = def->cputune.vcpupin[vcpu]->cpumask;
for (i = 0; i < virBitmapSize(cpumask); ++i) { if (virBitmapToData(cpumask, &map.map, (int *)&map.size) < 0)
if (virBitmapIsBitSet(cpumask, i)) goto cleanup;
VIR_USE_CPU(cpumap, i);
}
map.size = cpumaplen;
map.map = cpumap;
if (libxl_set_vcpuaffinity(cfg->ctx, def->id, vcpu, &map) != 0) { if (libxl_set_vcpuaffinity(cfg->ctx, def->id, vcpu, &map) != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -832,13 +815,13 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
goto cleanup; goto cleanup;
} }
VIR_FREE(cpumap); VIR_FREE(map.map);
} }
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(cpumap); VIR_FREE(map.map);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }