From dbf990fd31e833d49d4f8efd43b48f772c19990d Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 20 Jun 2018 10:43:07 +0200
Subject: [PATCH] qemu: monitor: Split out code to gather data from
 'query-block'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extract the code for future reuse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_monitor_json.c | 53 ++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b8634262fb..75d0738b5d 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2446,6 +2446,37 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
 }
 
 
+static int
+qemuMonitorJSONBlockStatsUpdateCapacityData(virJSONValuePtr image,
+                                            const char *name,
+                                            virHashTablePtr stats)
+{
+    qemuBlockStatsPtr bstats;
+
+    if (!(bstats = virHashLookup(stats, name))) {
+        if (VIR_ALLOC(bstats) < 0)
+            return -1;
+
+        if (virHashAddEntry(stats, name, bstats) < 0) {
+            VIR_FREE(bstats);
+            return -1;
+        }
+    }
+
+    /* failures can be ignored after this point */
+    if (virJSONValueObjectGetNumberUlong(image, "virtual-size",
+                                         &bstats->capacity) < 0)
+        return 0;
+
+    /* if actual-size is missing, image is not thin provisioned */
+    if (virJSONValueObjectGetNumberUlong(image, "actual-size",
+                                         &bstats->physical) < 0)
+        bstats->physical = bstats->capacity;
+
+    return 0;
+}
+
+
 static int
 qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValuePtr image,
                                            const char *dev_name,
@@ -2453,33 +2484,13 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValuePtr image,
                                            virHashTablePtr stats,
                                            bool backingChain)
 {
-    qemuBlockStatsPtr bstats;
     int ret = -1;
     char *entry_name = qemuDomainStorageAlias(dev_name, depth);
     virJSONValuePtr backing;
 
-    if (!(bstats = virHashLookup(stats, entry_name))) {
-        if (VIR_ALLOC(bstats) < 0)
-            goto cleanup;
-
-        if (virHashAddEntry(stats, entry_name, bstats) < 0) {
-            VIR_FREE(bstats);
-            goto cleanup;
-        }
-    }
-
-    /* After this point, we ignore failures; the stats were
-     * zero-initialized when created which is a sane fallback.  */
-    ret = 0;
-    if (virJSONValueObjectGetNumberUlong(image, "virtual-size",
-                                         &bstats->capacity) < 0)
+    if (qemuMonitorJSONBlockStatsUpdateCapacityData(image, entry_name, stats) < 0)
         goto cleanup;
 
-    /* if actual-size is missing, image is not thin provisioned */
-    if (virJSONValueObjectGetNumberUlong(image, "actual-size",
-                                         &bstats->physical) < 0)
-        bstats->physical = bstats->capacity;
-
     if (backingChain &&
         (backing = virJSONValueObjectGetObject(image, "backing-image"))) {
         ret = qemuMonitorJSONBlockStatsUpdateCapacityOne(backing,