[PATCH 07/21] qemuDomainGetStatsBlockExportHeader: Remove return value

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

 



The function always returns 0. Remove return value and fix callers.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_driver.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 877fefaa38..174dad64b0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17365,7 +17365,7 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDef *disk,
 }


-static int
+static void
 qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
                                   GHashTable *stats,
                                   virTypedParamList *params,
@@ -17391,7 +17391,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,

         (*recordnr)++;

-        return 0;
+        return;
     }

     /* vhost-user disk doesn't support getting block stats */
@@ -17400,7 +17400,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,

         (*recordnr)++;

-        return 0;
+        return;
     }

     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
@@ -17494,8 +17494,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
             }
         }
     }
-
-    return 0;
 }


@@ -17530,10 +17528,8 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,
     }

     for (i = 0; i < dom->def->ndisks; i++) {
-        if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats,
-                                              blockparams, &visited,
-                                              visitBacking, cfg, dom) < 0)
-            return -1;
+        qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, blockparams,
+                                          &visited, visitBacking, cfg, dom);
     }

     virTypedParamListAddUInt(params, visited, "block.count");
-- 
2.48.1




[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]

  Powered by Linux