[libvirt] [PATCH 06/35] qemu: Reuse virBitmapToDataBuf in qemuDomainGetEmulatorPinInfo

Peter Krempa pkrempa at redhat.com
Fri May 29 13:33:27 UTC 2015


---
 src/qemu/qemu_driver.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f6107b7..3fdc448 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5508,8 +5508,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
     virBitmapPtr cpumask = NULL;
     virBitmapPtr bitmap = NULL;
     virCapsPtr caps = NULL;
-    unsigned char *tmpmap = NULL;
-    int tmpmaplen;

     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -5547,12 +5545,7 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
         cpumask = bitmap;
     }

-    if (virBitmapToData(cpumask, &tmpmap, &tmpmaplen) < 0)
-        goto cleanup;
-    if (tmpmaplen > maplen)
-        tmpmaplen = maplen;
-    memcpy(cpumaps, tmpmap, tmpmaplen);
-    VIR_FREE(tmpmap);
+    virBitmapToDataBuf(cpumask, cpumaps, maplen);

     ret = 1;

-- 
2.4.1




More information about the libvir-list mailing list