[PATCH 07/17] virDomainIOThreadIDDefParseXML: Refactor cleanup

Peter Krempa pkrempa at redhat.com
Thu May 6 15:30:59 UTC 2021


Automatically free 'iothrid' and remove all the cleanup cruft.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/domain_conf.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index baf5d31606..78775bb2b3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17010,21 +17010,14 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
 static virDomainIOThreadIDDef *
 virDomainIOThreadIDDefParseXML(xmlNodePtr node)
 {
-    virDomainIOThreadIDDef *iothrid;
-
-    iothrid = g_new0(virDomainIOThreadIDDef, 1);
+    g_autoptr(virDomainIOThreadIDDef) iothrid = g_new0(virDomainIOThreadIDDef, 1);

     if (virXMLPropUInt(node, "id", 10,
                        VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
                        &iothrid->iothread_id) < 0)
-        goto error;
-
-    return iothrid;
+        return NULL;

- error:
-    virDomainIOThreadIDDefFree(iothrid);
-    iothrid = NULL;
-    return iothrid;
+    return g_steal_pointer(&iothrid);
 }


-- 
2.30.2




More information about the libvir-list mailing list