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

storage: Add error path for virStorageBackendCreateQemuImgCmdFromVol 

Rather than inline the various free's and return NULL, just create
an error label.
This commit is contained in:
John Ferlan 2017-10-06 12:12:38 -04:00
parent ae94084b76
commit 07731f9917
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/storage_util.c
View File

@ -1261,19 +1261,13 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn,
if (info.format == VIR_STORAGE_FILE_RAW &&
vol->target.encryption != NULL &&
vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) {
if (storageBackendCreateQemuImgSecretObject(cmd, vol, &info) < 0) {
VIR_FREE(info.secretAlias);
virCommandFree(cmd);
return NULL;
}
if (storageBackendCreateQemuImgSecretObject(cmd, vol, &info) < 0)
goto error;
enc = &vol->target.encryption->encinfo;
}
if (storageBackendCreateQemuImgSetOptions(cmd, imgformat, enc, info) < 0) {
VIR_FREE(info.secretAlias);
virCommandFree(cmd);
return NULL;
}
if (storageBackendCreateQemuImgSetOptions(cmd, imgformat, enc, info) < 0)
goto error;
VIR_FREE(info.secretAlias);
if (info.inputPath)
@ -1283,6 +1277,11 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn,
virCommandAddArgFormat(cmd, "%lluK", info.size_arg);
return cmd;
error:
VIR_FREE(info.secretAlias);
virCommandFree(cmd);
return NULL;
}