From: John Ferlan <jferlan@redhat.com>
Date: Wed, 20 Feb 2019 16:07:07 +0000 (-0500)
Subject: conf: Rework virDomainEmulatorPinDefParseXML
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6c2e8566f88553b70ad360d80d56c3c34dcaf62e;p=libvirt.git

conf: Rework virDomainEmulatorPinDefParseXML

In preparation for using auto free mechanism, change to using the
VIR_STEAL_PTR on @def to @ret and of course be sure to properly clean
up @def in cleanup.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 477deb777e..9b0dbe3c91 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18397,6 +18397,7 @@ static virBitmapPtr
 virDomainEmulatorPinDefParseXML(xmlNodePtr node)
 {
     virBitmapPtr def = NULL;
+    virBitmapPtr ret = NULL;
     char *tmp = NULL;
 
     if (!(tmp = virXMLPropString(node, "cpuset"))) {
@@ -18411,14 +18412,15 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node)
     if (virBitmapIsAllClear(def)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Invalid value of 'cpuset': %s"), tmp);
-        virBitmapFree(def);
-        def = NULL;
         goto cleanup;
     }
 
+    VIR_STEAL_PTR(ret, def);
+
  cleanup:
+    virBitmapFree(def);
     VIR_FREE(tmp);
-    return def;
+    return ret;
 }