External/libvirt
1
0
Fork 0
Code

qemuBlockStorageSourceDetachPrepare: Get rid of cleanup section

Browse Source 
Use g_new0 to completely avoid the 'cleanup' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-06 09:45:45 +01:00
parent 4653a5194c
commit 4415b11d6b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_block.c
View File

@ -1734,10 +1734,8 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
{ {
qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; g_autoptr(qemuBlockStorageSourceAttachData) data = NULL;
qemuBlockStorageSourceAttachDataPtr ret = NULL;
if (VIR_ALLOC(data) < 0) data = g_new0(qemuBlockStorageSourceAttachData, 1);
goto cleanup;
if (driveAlias) { if (driveAlias) {
data->driveAlias = g_steal_pointer(&driveAlias); data->driveAlias = g_steal_pointer(&driveAlias);
@ -1771,11 +1769,7 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias); data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias);
} }
ret = g_steal_pointer(&data); return g_steal_pointer(&data);
cleanup:
VIR_FREE(driveAlias);
return ret;
} }