Use 'virBitmapNewCopy' instead of 'virBitmapCopy'

There are only 3 places using the function. Two can use virBitmapNewCopy
directly. In case of the qemu capabilities code we need to free the old
bitmap first.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index da2633761d952a9fbe89015b204de3237b1f5878..0ba7323ee835d5169d5b572cc4ae11ad695f5e8d 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1589,8 +1589,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr caps)
                         cpus[cid].die_id = 0;
                         cpus[cid].socket_id = s;
                         cpus[cid].core_id = c;
-                        cpus[cid].siblings = virBitmapNew(ncpus);
-                        virBitmapCopy(cpus[cid].siblings, siblings);
+                        cpus[cid].siblings = virBitmapNewCopy(siblings);
                         cid++;
                     }
 

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e3a934363bc4c7889a9474f691dce9bb05a422a1..29cb78a3883a8c05097bc11c90c80a8654bfa901 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1932,7 +1932,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
 
     ret->ctime = qemuCaps->ctime;
 
-    virBitmapCopy(ret->flags, qemuCaps->flags);
+    virBitmapFree(ret->flags);
+    ret->flags = virBitmapNewCopy(qemuCaps->flags);
 
     ret->version = qemuCaps->version;
     ret->kvmVersion = qemuCaps->kvmVersion;

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index dabfa9990e60cd92f34be6125d6673462396851d..aea3fe8687cd358cbfbd12b6e841cb133710131d 100644 (file)
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -1158,9 +1158,9 @@ virResctrlAllocUpdateMask(virResctrlAllocPtr alloc,
         return -1;
 
     if (!a_type->masks[cache])
-        a_type->masks[cache] = virBitmapNew(virBitmapSize(mask));
+        a_type->masks[cache] = virBitmapNewCopy(mask);
 
-    return virBitmapCopy(a_type->masks[cache], mask);
+    return 0;
 }