From da53324a7937b4538ce18936b0cf5e6f34964e04 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 4 Jun 2021 15:08:32 +0200
Subject: [PATCH] chExtractVersion: Drop @ret
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After previous patches, the @ret variable and the 'cleanup'
label are redundant. Remove them.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
src/ch/ch_conf.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
index c67c815d45..5f156dfe44 100644
--- a/src/ch/ch_conf.c
+++ b/src/ch/ch_conf.c
@@ -194,7 +194,6 @@ virCHDriverConfigDispose(void *obj)
int
chExtractVersion(virCHDriver *driver)
{
- int ret = -1;
unsigned long version;
g_autofree char *help = NULL;
char *tmp = NULL;
@@ -209,7 +208,7 @@ chExtractVersion(virCHDriver *driver)
virCommandSetOutputBuffer(cmd, &help);
if (virCommandRun(cmd, NULL) < 0)
- goto cleanup;
+ return -1;
tmp = help;
@@ -217,24 +216,21 @@ chExtractVersion(virCHDriver *driver)
if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unexpected output of cloud-hypervisor binary"));
- goto cleanup;
+ return -1;
}
if (virParseVersionString(tmp, &version, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse cloud-hypervisor version: %s"), tmp);
- goto cleanup;
+ return -1;
}
if (version < MIN_VERSION) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cloud-Hypervisor version is too old (v15.0 is the minimum supported version)"));
- goto cleanup;
+ return -1;
}
driver->version = version;
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}