[libvirt] [PATCH 18/22] qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsOneBlockFallback

[Peter Krempa]

The open-coded version does not take much more space and additionally we
get rid of the hidden goto.

This also requires us to remove the 'cleanup' section.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c33fd6824c..b703436744 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -21373,8 +21373,6 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverPtr driver,
                                    virStorageSourcePtr src,
                                    size_t block_idx)
 {
-    int ret = -1;
-
     if (virStorageSourceIsEmpty(src))
         return 0;

@@ -21383,18 +21381,22 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverPtr driver,
         return 0;
     }

-    if (src->allocation)
-        QEMU_ADD_BLOCK_PARAM_ULL(params, block_idx,
-                                 "allocation", src->allocation);
-    if (src->capacity)
-        QEMU_ADD_BLOCK_PARAM_ULL(params, block_idx,
-                                 "capacity", src->capacity);
-    if (src->physical)
-        QEMU_ADD_BLOCK_PARAM_ULL(params, block_idx,
-                                 "physical", src->physical);
-    ret = 0;
- cleanup:
-    return ret;
+    if (src->allocation &&
+        virTypedParamListAddULL(params, src->allocation,
+                                "block.%zu.allocation", block_idx) < 0)
+        return -1;
+
+    if (src->capacity &&
+        virTypedParamListAddULL(params, src->capacity,
+                                "block.%zu.capacity", block_idx) < 0)
+        return -1;
+
+    if (src->physical &&
+        virTypedParamListAddULL(params, src->physical,
+                                "block.%zu.physical", block_idx) < 0)
+        return -1;
+
+    return 0;
 }


-- 
2.21.0