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

libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities

Browse Source 
Rather than casting the virBitmap pointer to uint8_t* and then using
the structure contents as a byte array, use the virBitmap API to determine
the bitmap size and test each bit.

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
This commit is contained in:
Jeremy Fitzhardinge 2013-10-30 10:38:08 -07:00 committed by Jim Fehlig
parent 835f992a68
commit ba1bf10063
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libxl/libxl_driver.c
View File

@ -448,7 +448,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
libxlDomainObjPrivatePtr priv = vm->privateData; libxlDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
libxl_bitmap map; libxl_bitmap map;
uint8_t *cpumask = NULL; virBitmapPtr cpumask = NULL;
uint8_t *cpumap = NULL; uint8_t *cpumap = NULL;
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
size_t cpumaplen; size_t cpumaplen;
@ -468,10 +468,12 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
goto cleanup; goto cleanup;
cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask; cpumask = def->cputune.vcpupin[vcpu]->cpumask;
for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) { for (i = 0; i < virBitmapSize(cpumask); ++i) {
if (cpumask[i]) bool bit;
ignore_value(virBitmapGetBit(cpumask, i, &bit));
if (bit)
VIR_USE_CPU(cpumap, i); VIR_USE_CPU(cpumap, i);
} }