From: John Ferlan <jferlan@redhat.com>
Date: Fri, 6 Apr 2018 16:05:38 +0000 (-0400)
Subject: conf: Convert virDomainChrSourceDefNew to return object
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2ada9ef1465f;p=libvirt.git

conf: Convert virDomainChrSourceDefNew to return object

Let's use object referencing to handle the ChrSourceDef. A subsequent
patch then can allow the monConfig to take an extra reference before
dropping the domain lock to then ensure nothing free's the memory that
needs to be used.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fd57364cd4..d23182f18a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2260,8 +2260,10 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest,
     return 0;
 }
 
-void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def)
+static void
+virDomainChrSourceDefDispose(void *obj)
 {
+    virDomainChrSourceDefPtr def = obj;
     size_t i;
 
     if (!def)
@@ -2275,11 +2277,16 @@ void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def)
             virSecurityDeviceLabelDefFree(def->seclabels[i]);
         VIR_FREE(def->seclabels);
     }
+}
 
 
-    VIR_FREE(def);
+void
+virDomainChrSourceDefFree(virDomainChrSourceDefPtr def)
+{
+    virObjectUnref(def);
 }
 
+
 /* virDomainChrSourceDefIsEqual:
  * @src: Source
  * @tgt: Target
@@ -12211,17 +12218,39 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
 }
 
 
+static virClassPtr virDomainChrSourceDefClass;
+
+static int
+virDomainChrSourceDefOnceInit(void)
+{
+    virDomainChrSourceDefClass = virClassNew(virClassForObject(),
+                                             "virDomainChrSourceDef",
+                                             sizeof(virDomainChrSourceDef),
+                                             virDomainChrSourceDefDispose);
+    if (!virDomainChrSourceDefClass)
+        return -1;
+    else
+        return 0;
+}
+
+VIR_ONCE_GLOBAL_INIT(virDomainChrSourceDef);
+
 virDomainChrSourceDefPtr
 virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt)
 {
     virDomainChrSourceDefPtr def = NULL;
 
-    if (VIR_ALLOC(def) < 0)
+    if (virDomainChrSourceDefInitialize() < 0)
+        return NULL;
+
+    if (!(def = virObjectNew(virDomainChrSourceDefClass)))
         return NULL;
 
     if (xmlopt && xmlopt->privateData.chrSourceNew &&
-        !(def->privateData = xmlopt->privateData.chrSourceNew()))
-        VIR_FREE(def);
+        !(def->privateData = xmlopt->privateData.chrSourceNew())) {
+        virObjectUnref(def);
+        def = NULL;
+    }
 
     return def;
 }