[libvirt PATCH 06/21] 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(a)redhat.com>
---
src/conf/domain_conf.c | 29 +++++++++++++++++++++++++----
src/conf/domain_conf.h | 3 +++
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 60f2b1129f..6df981ad47 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2524,6 +2524,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)
{
@@ -3325,7 +3346,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);
@@ -3663,7 +3684,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);
@@ -14916,11 +14937,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 c23c233184..72db861105 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3291,6 +3291,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);
--
2.31.1