]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuBlockStorageSourceDetachPrepare: Get rid of cleanup section
authorPeter Krempa <pkrempa@redhat.com>
Fri, 6 Mar 2020 08:45:45 +0000 (09:45 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 16 Mar 2020 10:01:08 +0000 (11:01 +0100)
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>
src/qemu/qemu_block.c

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