External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: checkpoint: Remove virDomainCheckpointDefParseNode

Browse Source 
Replace all it does by properly using virXMLParse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-22 17:56:53 +02:00
parent b1190e08ff
commit a84a2d8e1c
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/conf/checkpoint_conf.c
View File

@ -181,26 +181,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
return ret;
}
static virDomainCheckpointDef *
virDomainCheckpointDefParseNode(xmlDocPtr xml,
xmlNodePtr root,
virDomainXMLOption *xmlopt,
void *parseOpaque,
unsigned int flags)
{
g_autoptr(xmlXPathContext) ctxt = NULL;
if (!virXMLNodeNameEqual(root, "domaincheckpoint")) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("domaincheckpoint"));
return NULL;
}
if (!(ctxt = virXMLXPathContextNew(xml)))
return NULL;
ctxt->node = root;
return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags);
}
virDomainCheckpointDef *
virDomainCheckpointDefParseString(const char *xmlStr,
@ -208,19 +188,19 @@ virDomainCheckpointDefParseString(const char *xmlStr,
void *parseOpaque,
unsigned int flags)
{
virDomainCheckpointDef *ret = NULL;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
int keepBlanksDefault = xmlKeepBlanksDefault(0);
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"), NULL, NULL,
"domaincheckpoint.rng", true))) {
xmlKeepBlanksDefault(keepBlanksDefault);
ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml),
xmlopt, parseOpaque, flags);
}
xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"),
"domaincheckpoint", &ctxt, "domaincheckpoint.rng", true);
xmlKeepBlanksDefault(keepBlanksDefault);
return ret;
if (!xml)
return NULL;
return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags);
}