Remove qemuMonitorBlockStatsUpdateCapacityBlockdev

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

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a55b7abbeb3f0fa30932d6390002933dde201056..b0eff443aa596d199066a3af71a86f8dfcf91a4e 100644 (file)
--- 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) {
@@ -17733,9 +17726,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 ce6220fbfb21730e7f5270b52855bb234d06d012..f9b320f76535a65a1dc01228682d738cfaf48e38 100644 (file)
--- 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 dabe9799368e266aff7870c0454c894cd80bae38..f611ebfa24849c096afd853befa8e4ae6f9fe005 100644 (file)
--- 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 d5a8bd643a12bc04bebb6ce61f9e3094b64a44e6..c121c05ffd53d3c0f9c27c6246583f862d36bf7b 100644 (file)
--- 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 5944aec917d24eab17c190ec771e7547b63f0386..8b06b7599ef61c254c9e247cbbb661a02e922bfd 100644 (file)
--- 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);