External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chExtractVersion: Drop @ret

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2021-06-04 15:08:32 +02:00
parent 4292d4b786
commit da53324a79
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ch/ch_conf.c
View File

@ -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;
}