From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 19 Sep 2019 09:01:48 +0000 (+0200)
Subject: qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsBlockExportBac... 
X-Git-Tag: v5.8.0-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4dcfdf7a3d320162be19c5e73cb79c031d667f4;p=thirdparty%2Flibvirt.git

qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsBlockExportBackendStorage

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 48f7dfba14..b703486914 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -21482,20 +21482,16 @@ qemuDomainGetStatsBlockExportBackendStorage(const char *entryname,
                                             virTypedParamListPtr params)
 {
     qemuBlockStats *entry;
-    int ret = -1;
 
-    if (!stats || !entryname || !(entry = virHashLookup(stats, entryname))) {
-        ret = 0;
-        goto cleanup;
-    }
+    if (!stats || !entryname || !(entry = virHashLookup(stats, entryname)))
+        return 0;
 
-    if (entry->write_threshold)
-        QEMU_ADD_BLOCK_PARAM_ULL(params, recordnr, "threshold",
-                                 entry->write_threshold);
+    if (entry->write_threshold &&
+        virTypedParamListAddULLong(params, entry->write_threshold,
+                                   "block.%zu.threshold", recordnr) < 0)
+        return -1;
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }