External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Refactor error paths in virQEMUDriverCreateCapabilities

Browse Source 
Change the error label to "error" and simplify some error paths.
This commit is contained in:
Peter Krempa 2013-02-19 10:56:06 +01:00
parent cdf0ba1c3a
commit db07957646
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_conf.c
View File

@ -562,11 +562,8 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver)
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
/* Basic host arch / guest machine capabilities */ /* Basic host arch / guest machine capabilities */
if (!(caps = virQEMUCapsInit(driver->qemuCapsCache))) { if (!(caps = virQEMUCapsInit(driver->qemuCapsCache)))
virReportOOMError(); goto no_memory;
virObjectUnref(cfg);
return NULL;
}
if (cfg->allowDiskFormatProbing) { if (cfg->allowDiskFormatProbing) {
caps->defaultDiskDriverName = NULL; caps->defaultDiskDriverName = NULL;
@ -582,14 +579,12 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver)
if (virGetHostUUID(caps->host.host_uuid)) { if (virGetHostUUID(caps->host.host_uuid)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot get the host uuid")); "%s", _("cannot get the host uuid"));
goto err_exit; goto error;
} }
/* access sec drivers and create a sec model for each one */ /* access sec drivers and create a sec model for each one */
sec_managers = virSecurityManagerGetNested(driver->securityManager); if (!(sec_managers = virSecurityManagerGetNested(driver->securityManager)))
if (sec_managers == NULL) { goto error;
goto err_exit;
}
/* calculate length */ /* calculate length */
for (i = 0; sec_managers[i]; i++) for (i = 0; sec_managers[i]; i++)
@ -616,7 +611,7 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver)
no_memory: no_memory:
virReportOOMError(); virReportOOMError();
err_exit: error:
VIR_FREE(sec_managers); VIR_FREE(sec_managers);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);