From d4dcfdf7a3d320162be19c5e73cb79c031d667f4 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 19 Sep 2019 11:01:48 +0200 Subject: [PATCH] qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsBlockExportBackendStorage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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; }