From 9f8196ace23092b4aa446696cfa101fca4468601 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 29 May 2015 14:01:32 +0200 Subject: [PATCH] qemu: Refactor qemuDomainHelperGetVcpus by reusing virBitmapToDataBuf Get rid of the unnecessary allocation and copying of the bitmap and clean up some unnecesary temporary variables. --- src/qemu/qemu_driver.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3fdc4483ce..f32b87eb27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1416,7 +1416,7 @@ static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, int maplen) { - int maxcpu, hostcpus; + int hostcpus; size_t i, v; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1429,10 +1429,6 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, return -1; } - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; - /* Clamp to actual number of vcpus */ if (maxinfo > priv->nvcpupids) maxinfo = priv->nvcpupids; @@ -1457,25 +1453,15 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, } if (cpumaps != NULL) { - memset(cpumaps, 0, maplen * maxinfo); for (v = 0; v < maxinfo; v++) { unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); virBitmapPtr map = NULL; - unsigned char *tmpmap = NULL; - int tmpmapLen = 0; if (virProcessGetAffinity(priv->vcpupids[v], - &map, maxcpu) < 0) + &map, hostcpus) < 0) return -1; - if (virBitmapToData(map, &tmpmap, &tmpmapLen) < 0) { - virBitmapFree(map); - return -1; - } - if (tmpmapLen > maplen) - tmpmapLen = maplen; - memcpy(cpumap, tmpmap, tmpmapLen); - VIR_FREE(tmpmap); + virBitmapToDataBuf(map, cpumap, maplen); virBitmapFree(map); } }