From 9777419c81091edb1b8a21f2cc4e538d6c84754f Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 2 Jul 2015 16:26:59 +0200
Subject: [PATCH] vz: Use virBitmapToDataBuf instead of virBitmapToData in
 vzDomainGetVcpus

---
 src/vz/vz_driver.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 82a1cbd017..9f0c52f29f 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -807,7 +807,6 @@ vzDomainGetVcpus(virDomainPtr domain,
 {
     virDomainObjPtr privdom = NULL;
     size_t i;
-    int v;
     int ret = -1;
 
     if (!(privdom = vzDomObjFromDomainRef(domain)))
@@ -831,19 +830,11 @@ vzDomainGetVcpus(virDomainPtr domain,
             }
         }
         if (cpumaps != NULL) {
-            unsigned char *tmpmap = NULL;
-            int tmpmapLen = 0;
-
             memset(cpumaps, 0, maplen * maxinfo);
-            virBitmapToData(privdom->def->cpumask, &tmpmap, &tmpmapLen);
-            if (tmpmapLen > maplen)
-                tmpmapLen = maplen;
-
-            for (v = 0; v < maxinfo; v++) {
-                unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v);
-                memcpy(cpumap, tmpmap, tmpmapLen);
-            }
-            VIR_FREE(tmpmap);
+            for (i = 0; i < maxinfo; i++)
+                virBitmapToDataBuf(privdom->def->cpumask,
+                                   VIR_GET_CPUMAP(cpumaps, maplen, i),
+                                   maplen);
         }
     }
     ret = maxinfo;