So far, iothread configuration structure (virDomainIOThreadIDDef)
is allocated by plain g_new0(). This is perfectly okay because
all members of the struct default to value 0 anyway. But soon
this is going to change. Therefore, replace those g_new0() with a
function so that the default value can be set consistently in one
place.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_conf.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c60ab4e064..8d4b27dbc0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3476,6 +3476,15 @@ virDomainIOThreadIDArrayHasPin(virDomainDef *def)
}
+static virDomainIOThreadIDDef *
+virDomainIOThreadIDDefNew(void)
+{
+ virDomainIOThreadIDDef *def = g_new0(virDomainIOThreadIDDef, 1);
+
+ return def;
+}
+
+
void
virDomainIOThreadIDDefFree(virDomainIOThreadIDDef *def)
{
@@ -3539,7 +3548,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDef *def,
_("failed to populate iothreadids"));
return -1;
}
- iothrid = g_new0(virDomainIOThreadIDDef, 1);
+ iothrid = virDomainIOThreadIDDefNew();
iothrid->iothread_id = nxt;
iothrid->autofill = true;
def->iothreadids[def->niothreadids++] = g_steal_pointer(&iothrid);
@@ -17008,7 +17017,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
static virDomainIOThreadIDDef *
virDomainIOThreadIDDefParseXML(xmlNodePtr node)
{
- g_autoptr(virDomainIOThreadIDDef) iothrid = g_new0(virDomainIOThreadIDDef, 1);
+ g_autoptr(virDomainIOThreadIDDef) iothrid = virDomainIOThreadIDDefNew();
if (virXMLPropUInt(node, "id", 10,
VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
@@ -22931,8 +22940,7 @@ virDomainIOThreadIDAdd(virDomainDef *def,
{
virDomainIOThreadIDDef *iothrid = NULL;
- iothrid = g_new0(virDomainIOThreadIDDef, 1);
-
+ iothrid = virDomainIOThreadIDDefNew();
iothrid->iothread_id = iothread_id;
VIR_APPEND_ELEMENT_COPY(def->iothreadids, def->niothreadids, iothrid);
--
2.35.1