From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 2 Oct 2020 08:26:34 +0000 (+0200)
Subject: Use 'virBitmapNewCopy' instead of 'virBitmapCopy'
X-Git-Tag: v6.9.0-rc1~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8a354954aba9cd45ab0317915a0a2be27c04767;p=thirdparty%2Flibvirt.git

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 da2633761d..0ba7323ee8 100644
--- 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 e3a934363b..29cb78a388 100644
--- 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 dabfa9990e..aea3fe8687 100644
--- 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;
 }