openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ch_conf: Move error reporting into chExtractVersionInfo() 

If chExtractVersionInfo() fails, in some cases it reports error
and in some it doesn't. Fix those places and drop reporting error
from chExtractVersion() which would just overwrite more specific
error.

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 14:18:50 +02:00
parent 1e94e18e12
commit 6fcbedad40
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ch/ch_conf.c
View File

@ -213,11 +213,17 @@ chExtractVersionInfo(int *retversion)
tmp = help;
/* expected format: cloud-hypervisor v<major>.<minor>.<micro> */
if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL)
if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unexpected output of cloud-hypervisor binary"));
goto cleanup;
}
if (virParseVersionString(tmp, &version, true) < 0)
if (virParseVersionString(tmp, &version, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse cloud-hypervisor version: %s"), tmp);
goto cleanup;
}
if (version < MIN_VERSION) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -241,11 +247,8 @@ int chExtractVersion(virCHDriver *driver)
if (driver->version > 0)
return 0;
if (chExtractVersionInfo(&driver->version) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not extract Cloud-Hypervisor version"));
if (chExtractVersionInfo(&driver->version) < 0)
return -1;
}
return 0;
}