]> xenbits.xensource.com Git - libvirt.git/commitdiff
virDomainDefParseIOThreads: Use g_autoptr() for @iothrid
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 16 May 2022 09:48:15 +0000 (11:48 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 10 Jun 2022 11:53:52 +0000 (13:53 +0200)
Using g_autoptr() for @iothrid variable inside
virDomainDefParseIOThreads() allows us to drop explicit call to
virDomainIOThreadIDDefFree() in one case.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/conf/domain_conf.c

index 9f75012f1f353a527d18dd4ecf77f87262957be9..cc1f765ca9989a7f90dca562830b66acb800168f 100644 (file)
@@ -17047,7 +17047,8 @@ virDomainDefParseIOThreads(virDomainDef *def,
         def->iothreadids = g_new0(virDomainIOThreadIDDef *, n);
 
     for (i = 0; i < n; i++) {
-        virDomainIOThreadIDDef *iothrid = NULL;
+        g_autoptr(virDomainIOThreadIDDef) iothrid = NULL;
+
         if (!(iothrid = virDomainIOThreadIDDefParseXML(nodes[i])))
             return -1;
 
@@ -17055,10 +17056,9 @@ virDomainDefParseIOThreads(virDomainDef *def,
             virReportError(VIR_ERR_XML_ERROR,
                            _("duplicate iothread id '%u' found"),
                            iothrid->iothread_id);
-            virDomainIOThreadIDDefFree(iothrid);
             return -1;
         }
-        def->iothreadids[def->niothreadids++] = iothrid;
+        def->iothreadids[def->niothreadids++] = g_steal_pointer(&iothrid);
     }
 
     return virDomainIOThreadIDDefArrayInit(def, iothreads);