conf: Add new/free functions for virDomainIOMMUDef

This will make it possible to limit changes to a single spot
later on, and is also just an overall nicer way to create and
destroy objects.

Signed-off-by: Andrea Bolognani <abologna@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 0618343b79557d2dd5f1270e2e6fab7dbe89cfb9..15228d1e38b8312d334c5498c2e7d621601f2c83 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2534,6 +2534,27 @@ virDomainVsockDefFree(virDomainVsockDef *vsock)
 }
 
 
+virDomainIOMMUDef *
+virDomainIOMMUDefNew(void)
+{
+    g_autoptr(virDomainIOMMUDef) iommu = NULL;
+
+    iommu = g_new0(virDomainIOMMUDef, 1);
+
+    return g_steal_pointer(&iommu);
+}
+
+
+void
+virDomainIOMMUDefFree(virDomainIOMMUDef *iommu)
+{
+    if (!iommu)
+        return;
+
+    g_free(iommu);
+}
+
+
 void
 virDomainNetTeamingInfoFree(virDomainNetTeamingInfo *teaming)
 {
@@ -3336,7 +3357,7 @@ void virDomainDeviceDefFree(virDomainDeviceDef *def)
         virDomainMemoryDefFree(def->data.memory);
         break;
     case VIR_DOMAIN_DEVICE_IOMMU:
-        g_free(def->data.iommu);
+        virDomainIOMMUDefFree(def->data.iommu);
         break;
     case VIR_DOMAIN_DEVICE_VSOCK:
         virDomainVsockDefFree(def->data.vsock);
@@ -3674,7 +3695,7 @@ void virDomainDefFree(virDomainDef *def)
         virDomainPanicDefFree(def->panics[i]);
     g_free(def->panics);
 
-    g_free(def->iommu);
+    virDomainIOMMUDefFree(def->iommu);
 
     g_free(def->idmap.uidmap);
     g_free(def->idmap.gidmap);
@@ -14923,11 +14944,11 @@ virDomainIOMMUDefParseXML(xmlNodePtr node,
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     xmlNodePtr driver;
-    g_autofree virDomainIOMMUDef *iommu = NULL;
+    g_autoptr(virDomainIOMMUDef) iommu = NULL;
 
     ctxt->node = node;
 
-    iommu = g_new0(virDomainIOMMUDef, 1);
+    iommu = virDomainIOMMUDefNew();
 
     if (virXMLPropEnum(node, "model", virDomainIOMMUModelTypeFromString,
                        VIR_XML_PROP_REQUIRED, &iommu->model) < 0)

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1ac802feca592eac9725b9fb4442272ee389d3e5..4624bad1f761f9177634a43b3410f569cf8002f8 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3300,6 +3300,9 @@ bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont);
 virDomainFSDef *virDomainFSDefNew(virDomainXMLOption *xmlopt);
 void virDomainFSDefFree(virDomainFSDef *def);
 void virDomainActualNetDefFree(virDomainActualNetDef *def);
+virDomainIOMMUDef *virDomainIOMMUDefNew(void);
+void virDomainIOMMUDefFree(virDomainIOMMUDef *iommu);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainIOMMUDef, virDomainIOMMUDefFree);
 virDomainVsockDef *virDomainVsockDefNew(virDomainXMLOption *xmlopt);
 void virDomainVsockDefFree(virDomainVsockDef *vsock);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVsockDef, virDomainVsockDefFree);