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

Refactoring virDomainControllerDefParseXML() to use XPath

Browse Source 
Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-05-04 13:40:02 +02:00 committed by Michal Privoznik
parent 8d635a0bf2
commit 1810562e11
1 changed files with 78 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
src/conf/domain_conf.c
View File

@ -9410,9 +9410,11 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
{ {
g_autoptr(virDomainControllerDef) def = NULL; g_autoptr(virDomainControllerDef) def = NULL;
virDomainControllerType type = 0; virDomainControllerType type = 0;
xmlNodePtr cur = NULL; xmlNodePtr driver = NULL;
bool processedModel = false; g_autofree xmlNodePtr *targetNodes = NULL;
bool processedTarget = false; int ntargetNodes = 0;
g_autofree xmlNodePtr *modelNodes = NULL;
int nmodelNodes = 0;
int numaNode = -1; int numaNode = -1;
int ports = -1; int ports = -1;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
@ -9448,94 +9450,86 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
def->idx = idxVal; def->idx = idxVal;
} }
cur = node->children; if ((driver = virXPathNode("./driver", ctxt))) {
while (cur != NULL) { if (virXMLPropUInt(driver, "queues", 10, VIR_XML_PROP_NONE,
if (cur->type == XML_ELEMENT_NODE) { &def->queues) < 0)
if (virXMLNodeNameEqual(cur, "driver")) { return NULL;
if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE,
&def->queues) < 0)
return NULL;
if (virXMLPropUInt(cur, "cmd_per_lun", 10, VIR_XML_PROP_NONE, if (virXMLPropUInt(driver, "cmd_per_lun", 10, VIR_XML_PROP_NONE,
&def->cmd_per_lun) < 0) &def->cmd_per_lun) < 0)
return NULL; return NULL;
if (virXMLPropUInt(cur, "max_sectors", 10, VIR_XML_PROP_NONE, if (virXMLPropUInt(driver, "max_sectors", 10, VIR_XML_PROP_NONE,
&def->max_sectors) < 0) &def->max_sectors) < 0)
return NULL; return NULL;
if (virXMLPropTristateSwitch(cur, "ioeventfd", if (virXMLPropTristateSwitch(driver, "ioeventfd",
VIR_XML_PROP_NONE, VIR_XML_PROP_NONE,
&def->ioeventfd) < 0) &def->ioeventfd) < 0)
return NULL; return NULL;
if (virXMLPropUInt(cur, "iothread", 10, VIR_XML_PROP_NONE, if (virXMLPropUInt(driver, "iothread", 10, VIR_XML_PROP_NONE,
&def->iothread) < 0) &def->iothread) < 0)
return NULL; return NULL;
if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0) if (virDomainVirtioOptionsParseXML(driver, &def->virtio) < 0)
return NULL; return NULL;
} else if (virXMLNodeNameEqual(cur, "model")) { }
if (processedModel) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in "
"controller definition not allowed"));
return NULL;
}
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { nmodelNodes = virXPathNodeSet("./model", ctxt, &modelNodes);
if (virXMLPropEnum(cur, "name", if (nmodelNodes == 1) {
virDomainControllerPCIModelNameTypeFromString, if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
VIR_XML_PROP_NONE, if (virXMLPropEnum(modelNodes[0], "name",
&def->opts.pciopts.modelName) < 0) virDomainControllerPCIModelNameTypeFromString,
return NULL; VIR_XML_PROP_NONE,
} &def->opts.pciopts.modelName) < 0)
return NULL;
processedModel = true;
} else if (virXMLNodeNameEqual(cur, "target")) {
if (processedTarget) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <target> elements in "
"controller definition not allowed"));
return NULL;
}
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (virXMLPropInt(cur, "chassisNr", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.chassisNr) < 0)
return NULL;
if (virXMLPropInt(cur, "chassis", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.chassis) < 0)
return NULL;
if (virXMLPropInt(cur, "port", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.port) < 0)
return NULL;
if (virXMLPropInt(cur, "busNr", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.busNr) < 0)
return NULL;
if (virXMLPropTristateSwitch(cur, "hotplug",
VIR_XML_PROP_NONE,
&def->opts.pciopts.hotplug) < 0)
return NULL;
if ((rc = virXMLPropInt(cur, "index", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.targetIndex)) < 0)
return NULL;
if ((rc == 1) && def->opts.pciopts.targetIndex == -1) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid target index '%i' in PCI controller"),
def->opts.pciopts.targetIndex);
}
}
processedTarget = true;
}
} }
cur = cur->next; } else if (nmodelNodes > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in "
"controller definition not allowed"));
return NULL;
}
ntargetNodes = virXPathNodeSet("./target", ctxt, &targetNodes);
if (ntargetNodes == 1) {
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (virXMLPropInt(targetNodes[0], "chassisNr", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.chassisNr) < 0)
return NULL;
if (virXMLPropInt(targetNodes[0], "chassis", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.chassis) < 0)
return NULL;
if (virXMLPropInt(targetNodes[0], "port", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.port) < 0)
return NULL;
if (virXMLPropInt(targetNodes[0], "busNr", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.busNr) < 0)
return NULL;
if (virXMLPropTristateSwitch(targetNodes[0], "hotplug",
VIR_XML_PROP_NONE,
&def->opts.pciopts.hotplug) < 0)
return NULL;
if ((rc = virXMLPropInt(targetNodes[0], "index", 0, VIR_XML_PROP_NONE,
&def->opts.pciopts.targetIndex)) < 0)
return NULL;
if ((rc == 1) && def->opts.pciopts.targetIndex == -1)
virReportError(VIR_ERR_XML_ERROR,
_("Invalid target index '%i' in PCI controller"),
def->opts.pciopts.targetIndex);
}
} else if (ntargetNodes > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <target> elements in "
"controller definition not allowed"));
return NULL;
} }
/* node is parsed differently from target attributes because /* node is parsed differently from target attributes because