From 3ebde403c76ee046c53ebf7b80dff7eb11e94748 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 19 Sep 2019 11:32:09 +0200 Subject: [PATCH] qemu: driver: Remove unused cleanup labels in stats gathering functions 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 | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 98919b8db0..0c65414a1a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -21525,22 +21525,18 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDefPtr disk, size_t recordnr, virTypedParamListPtr params) { - int ret = -1; - if (virTypedParamListAddString(params, disk->dst, "block.%zu.name", recordnr) < 0) - goto cleanup; + return -1; if (virStorageSourceIsLocalStorage(src) && src->path && virTypedParamListAddString(params, src->path, "block.%zu.path", recordnr) < 0) - goto cleanup; + return -1; if (src->id && virTypedParamListAddUInt(params, src->id, "block.%zu.backingIndex", recordnr) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -21784,20 +21780,16 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, { size_t i; qemuDomainObjPrivatePtr priv = dom->privateData; - int ret = -1; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { if (!virPerfEventIsEnabled(priv->perf, i)) continue; if (qemuDomainGetStatsPerfOneEvent(priv->perf, i, params) < 0) - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } typedef int