External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 22:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Convert virDomainChrSourceDefNew to return object

Browse Source 
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>
This commit is contained in:
John Ferlan 2018-04-06 12:05:38 -04:00
parent 9e792d1aaa
commit 2ada9ef146
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/conf/domain_conf.c
View File

@ -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;
}