Re: [PATCH 3/5] Remove separator argument from virBitmapParse

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Jun 17, 2016 at 03:33:41PM +0200, Ján Tomko wrote:
Most the callers pass 0 in one form or another, including
vircapstest which used VIR_ARCH_NONE.
---
src/conf/domain_conf.c     | 15 +++++++--------
src/conf/network_conf.c    |  2 +-
src/conf/numa_conf.c       |  7 +++----
src/lxc/lxc_controller.c   |  2 +-
src/lxc/lxc_native.c       |  4 ++--
src/nodeinfo.c             |  2 +-
src/qemu/qemu_domain.c     |  2 +-
src/qemu/qemu_driver.c     |  2 +-
src/qemu/qemu_process.c    |  2 +-
src/util/virbitmap.c       | 10 +---------
src/util/virbitmap.h       |  3 +--
src/util/virhostcpu.c      |  2 +-
src/vz/vz_sdk.c            |  2 +-
src/xenconfig/xen_common.c |  2 +-
src/xenconfig/xen_sxpr.c   |  3 +--
tests/qemuxml2argvtest.c   |  2 +-
tests/virbitmaptest.c      | 22 +++++++++++-----------
tests/vircapstest.c        |  2 +-
tools/virsh-domain.c       |  2 +-
19 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index 5fa13c2..89c41d0 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -527,9 +527,9 @@ test10(const void *opaque ATTRIBUTE_UNUSED)
    virBitmapPtr b1 = NULL, b2 = NULL, b3 = NULL, b4 = NULL;

    if (virBitmapParseSeparator("0-3,5-8,11-15f16", 'f', &b1, 20) < 0 ||

Of course that in case the condition from the previous commit is true,
then this needs to be changed, but it's kinda obvious.

@@ -567,9 +567,9 @@ test11(const void *opaque)
    virBitmapPtr resmap = NULL;
    int ret = -1;

-    if (virBitmapParse(data->a, 0, &amap, 256) < 0 ||
-        virBitmapParse(data->b, 0, &bmap, 256) < 0 ||
-        virBitmapParse(data->res, 0, &resmap, 256) < 0)
+    if (virBitmapParse(data->a, &amap, 256) < 0 ||
+        virBitmapParse(data->b, &bmap, 256) < 0 ||
+        virBitmapParse(data->res, &resmap, 256) < 0)
        goto cleanup;

    virBitmapSubtract(amap, bmap);
diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 561c13d..27d17bd 100644
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -104,7 +104,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED)
    if (!(caps = buildNUMATopology(3)))
        goto error;

-    if (virBitmapParse(nodestr, VIR_ARCH_NONE, &nodemask, mask_size) < 0)
+    if (virBitmapParse(nodestr, &nodemask, mask_size) < 0)

LOL!

ACK

Attachment: signature.asc
Description: Digital signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]