From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 2 Oct 2020 08:36:59 +0000 (+0200)
Subject: virDomainResctrlNew: Refactor allocation to remove 'cleanup' label
X-Git-Tag: v6.9.0-rc1~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12f4e2658f187943640d287d7dd5e665156c558;p=thirdparty%2Flibvirt.git

virDomainResctrlNew: Refactor allocation to remove 'cleanup' label

If we use g_new0 there's no need for the 'cleanup' label as there's
nothing to fail after the allocation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f716338efd..175b632a38 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -20900,7 +20900,6 @@ virDomainResctrlNew(xmlNodePtr node,
                     unsigned int flags)
 {
     virDomainResctrlDefPtr resctrl = NULL;
-    virDomainResctrlDefPtr ret = NULL;
     g_autofree char *vcpus_str = NULL;
     g_autofree char *alloc_id = NULL;
 
@@ -20923,18 +20922,13 @@ virDomainResctrlNew(xmlNodePtr node,
     }
 
     if (virResctrlAllocSetID(alloc, alloc_id) < 0)
-        goto cleanup;
-
-    if (VIR_ALLOC(resctrl) < 0)
-        goto cleanup;
+        return NULL;
 
+    resctrl = g_new0(virDomainResctrlDef, 1);
     resctrl->vcpus = virBitmapNewCopy(vcpus);
     resctrl->alloc = virObjectRef(alloc);
 
-    ret = g_steal_pointer(&resctrl);
- cleanup:
-    virDomainResctrlDefFree(resctrl);
-    return ret;
+    return resctrl;
 }