openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: Introduce virDomainMemoryDefNew() 

This is new allocator for virDomainMemoryDef struct which also
sets some default values: @model and @targetNode.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
This commit is contained in:
Michal Privoznik 2022-10-17 14:55:04 +02:00
parent f0fc7cc767
commit c15fe4ca2f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/domain_conf.c
View File

@ -13088,9 +13088,6 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
ctxt->node = node;
/* initialize to value which marks that the user didn't specify it */
def->targetNode = -1;
if ((rv = virXPathInt("string(./node)", ctxt, &def->targetNode)) == -2 ||
(rv == 0 && def->targetNode < 0)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@ -13226,6 +13223,20 @@ virDomainSecDefParseXML(xmlNodePtr lsecNode,
}
virDomainMemoryDef *
virDomainMemoryDefNew(virDomainMemoryModel model)
{
virDomainMemoryDef *def = NULL;
def = g_new0(virDomainMemoryDef, 1);
def->model = model;
/* initialize to value which marks that the user didn't specify it */
def->targetNode = -1;
return def;
}
static virDomainMemoryDef *
virDomainMemoryDefParseXML(virDomainXMLOption *xmlopt,
xmlNodePtr memdevNode,
@ -13234,18 +13245,19 @@ virDomainMemoryDefParseXML(virDomainXMLOption *xmlopt,
{
VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr node;
virDomainMemoryDef *def;
virDomainMemoryDef *def = NULL;
virDomainMemoryModel model;
g_autofree char *tmp = NULL;
def = g_new0(virDomainMemoryDef, 1);
ctxt->node = memdevNode;
if (virXMLPropEnum(memdevNode, "model", virDomainMemoryModelTypeFromString,
VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
&def->model) < 0)
&model) < 0)
goto error;
def = virDomainMemoryDefNew(model);
if (virXMLPropEnum(memdevNode, "access", virDomainMemoryAccessTypeFromString,
VIR_XML_PROP_NONZERO, &def->access) < 0)
goto error;

1
src/conf/domain_conf.h
View File

@ -2619,6 +2619,7 @@ struct _virDomainMemoryDef {
virDomainDeviceInfo info;
};
virDomainMemoryDef *virDomainMemoryDefNew(virDomainMemoryModel model);
void virDomainMemoryDefFree(virDomainMemoryDef *def);
struct _virDomainIdMapEntry {