From: Peter Krempa <pkrempa@redhat.com>

Remove the function and address the ripple effect the removal has.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/qemu/qemu_driver.c       | 16 +++-------------
 src/qemu/qemu_monitor.c      | 12 ------------
 src/qemu/qemu_monitor.h      |  5 -----
 src/qemu/qemu_monitor_json.c |  9 ---------
 src/qemu/qemu_monitor_json.h |  3 ---
 5 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b6d83f1dc6..806408115f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9597,7 +9597,6 @@ qemuDomainBlockStatsGatherTotals(qemuBlockStats *data,
  * @driver: driver object
  * @vm: domain object
  * @path: to gather the statistics for
- * @capacity: refresh capacity of the backing image
  * @retstats: returns pointer to structure holding the stats
  *
  * Gathers the block statistics for use in qemuDomainBlockStats* APIs.
@@ -9607,7 +9606,6 @@ qemuDomainBlockStatsGatherTotals(qemuBlockStats *data,
 static int
 qemuDomainBlocksStatsGather(virDomainObj *vm,
                             const char *path,
-                            bool capacity,
                             qemuBlockStats **retstats)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -9644,10 +9642,6 @@ qemuDomainBlocksStatsGather(virDomainObj *vm,

     qemuDomainObjEnterMonitor(vm);
     nstats = qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats);
-
-    if (capacity && nstats >= 0)
-        rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, blockstats);
-
     qemuDomainObjExitMonitor(vm);

     if (nstats < 0 || rc < 0)
@@ -9713,7 +9707,7 @@ qemuDomainBlockStats(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    if (qemuDomainBlocksStatsGather(vm, path, false, &blockstats) < 0)
+    if (qemuDomainBlocksStatsGather(vm, path, &blockstats) < 0)
         goto endjob;

     if (VIR_ASSIGN_IS_OVERFLOW(stats->rd_req, blockstats->rd_req) ||
@@ -9769,8 +9763,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    if ((nstats = qemuDomainBlocksStatsGather(vm, path, false,
-                                              &blockstats)) < 0)
+    if ((nstats = qemuDomainBlocksStatsGather(vm, path, &blockstats)) < 0)
         goto endjob;

     /* return count of supported stats */
@@ -10603,7 +10596,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
         goto endjob;
     }

-    if (qemuDomainBlocksStatsGather(vm, path, true, &entry) < 0)
+    if (qemuDomainBlocksStatsGather(vm, path, &entry) < 0)
         goto endjob;

     if (!entry->wr_highest_offset_valid) {
@@ -17724,9 +17717,6 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,

         rc = qemuMonitorGetAllBlockStatsInfo(priv->mon, &stats);

-        if (rc >= 0)
-            rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);
-
         qemuDomainObjExitMonitor(dom);

         /* failure to retrieve stats is fine at this point */
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index ce6220fbfb..f9b320f765 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2032,18 +2032,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon,
 }


-int
-qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
-                                            GHashTable *stats)
-{
-    VIR_DEBUG("stats=%p", stats);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(mon, stats);
-}
-
-
 /**
  * qemuMonitorBlockGetNamedNodeData:
  * @mon: monitor object
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 4f94edb05f..0555bcbf8e 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -821,11 +821,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon,
                                 GHashTable **ret_stats)
     ATTRIBUTE_NONNULL(2);

-int
-qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
-                                            GHashTable *stats)
-    ATTRIBUTE_NONNULL(2);
-
 typedef struct _qemuBlockNamedNodeDataBitmap qemuBlockNamedNodeDataBitmap;
 struct _qemuBlockNamedNodeDataBitmap {
     char *name;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0aa74e226d..e00bc0cf1b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2629,15 +2629,6 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon,
 }


-int
-qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon G_GNUC_UNUSED,
-                                                GHashTable *stats G_GNUC_UNUSED)
-{
-
-    return 0;
-}
-
-
 static void
 qemuMonitorJSONBlockNamedNodeDataBitmapFree(qemuBlockNamedNodeDataBitmap *bitmap)
 {
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 5944aec917..8b06b7599e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -94,9 +94,6 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon,
 int
 qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon,
                                     GHashTable *hash);
-int
-qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
-                                                GHashTable *stats);

 GHashTable *
 qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValue *nodes);
-- 
2.51.0