conf: virdomainobjlist: Remove return value from virDomainObjListCollect

The function can't fail so there's no point in returning anything.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 4968dfcf3e3d6cfd4f6f170fcb20ac38dda383a8..13675acda5f2a618cbaf3dde11df4256fa712804 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -964,7 +964,7 @@ virDomainObjListFilter(virDomainObj ***list,
 }
 
 
-int
+void
 virDomainObjListCollect(virDomainObjList *domlist,
                         virConnectPtr conn,
                         virDomainObj ***vms,
@@ -974,8 +974,6 @@ virDomainObjListCollect(virDomainObjList *domlist,
 {
     virDomainObjListCollectAll(domlist, vms, nvms);
     virDomainObjListFilter(vms, nvms, conn, filter, flags);
-
-    return 0;
 }
 
 
@@ -1046,8 +1044,7 @@ virDomainObjListExport(virDomainObjList *domlist,
     size_t i;
     int ret = -1;
 
-    if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0)
-        return -1;
+    virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags);
 
     if (domains) {
         doms = g_new0(virDomainPtr, nvms + 1);

diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h
index 8c536803747cf01b6665bb931294671cc6c56324..058f2c4ca6be104453cafd7458fa990a354473b1 100644 (file)
--- a/src/conf/virdomainobjlist.h
+++ b/src/conf/virdomainobjlist.h
@@ -149,7 +149,7 @@ void
 virDomainObjListCollectAll(virDomainObjList *domlist,
                            virDomainObj ***vms,
                            size_t *nvms);
-int
+void
 virDomainObjListCollect(virDomainObjList *doms,
                         virConnectPtr conn,
                         virDomainObj ***vms,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 13ef9285fc6fe52bc296049e52c84b39c1e47091..1c74ea96bce0152cef7e9d4952a230b2cb87359e 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18666,10 +18666,9 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
                                     lflags, true) < 0)
             return -1;
     } else {
-        if (virDomainObjListCollect(driver->domains, conn, &vms, &nvms,
-                                    virConnectGetAllDomainStatsCheckACL,
-                                    lflags) < 0)
-            return -1;
+        virDomainObjListCollect(driver->domains, conn, &vms, &nvms,
+                                virConnectGetAllDomainStatsCheckACL,
+                                lflags);
     }
 
     tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1);

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 6c21c6bcb4a6fdf4daac9ce94f51c4c479994f6f..bd6f063a003dc1284e21b54c9c1af3973239c14c 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -9923,9 +9923,7 @@ testConnectGetAllDomainStats(virConnectPtr conn,
                                     &nvms, NULL, lflags, true) < 0)
             return -1;
     } else {
-        if (virDomainObjListCollect(driver->domains, conn, &vms, &nvms,
-                                    NULL, lflags) < 0)
-            return -1;
+        virDomainObjListCollect(driver->domains, conn, &vms, &nvms, NULL, lflags);
     }
 
     tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1);

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index d5147a6c0d9c403f38b9a12c5496df230c51869a..327704b375f75d638fb7122e26defe0d9c47339b 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -3771,10 +3771,9 @@ vzConnectGetAllDomainStats(virConnectPtr conn,
                                     lflags, true) < 0)
             return -1;
     } else {
-        if (virDomainObjListCollect(driver->domains, conn, &doms, &ndoms,
-                                    virConnectGetAllDomainStatsCheckACL,
-                                    lflags) < 0)
-            return -1;
+        virDomainObjListCollect(driver->domains, conn, &doms, &ndoms,
+                                virConnectGetAllDomainStatsCheckACL,
+                                lflags);
     }
 
     tmpstats = g_new0(virDomainStatsRecordPtr, ndoms + 1);