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

Refactoring virDomainBlkioDeviceParseXML() to use XPath

Browse Source 
Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-05-04 13:39:58 +02:00 committed by Michal Privoznik
parent 6ec66671da
commit 2cf6a488d1
1 changed files with 52 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/conf/domain_conf.c
View File

@ -1666,88 +1666,68 @@ virBlkioDeviceArrayClear(virBlkioDevice *devices,
*/ */
static int static int
virDomainBlkioDeviceParseXML(xmlNodePtr root, virDomainBlkioDeviceParseXML(xmlNodePtr root,
xmlXPathContextPtr ctxt G_GNUC_UNUSED, xmlXPathContextPtr ctxt,
virBlkioDevice *dev) virBlkioDevice *dev)
{ {
xmlNodePtr node;
g_autofree char *path = NULL; g_autofree char *path = NULL;
g_autofree char *weight = NULL;
g_autofree char *read_bytes_sec = NULL;
g_autofree char *write_bytes_sec = NULL;
g_autofree char *read_iops_sec = NULL;
g_autofree char *write_iops_sec = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
for (node = root->children; node != NULL; node = node->next) { ctxt->node = root;
g_autofree char *c = NULL;
if (node->type != XML_ELEMENT_NODE) /* To avoid the need for explicit cleanup on failure,
continue; * don't set dev->path until we're assured of
* success. Until then, store it in an autofree pointer.
if (!(c = virXMLNodeContentString(node))) */
return -1; if (!(path = virXPathString("string(./path)", ctxt))) {
if (virXMLNodeNameEqual(node, "path")) {
/* To avoid the need for explicit cleanup on failure,
* don't set dev->path until we're assured of
* success. Until then, store it in an autofree pointer.
*/
if (!path)
path = g_steal_pointer(&c);
continue;
}
if (virXMLNodeNameEqual(node, "weight")) {
if (virStrToLong_ui(c, NULL, 10, &dev->weight) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse weight %s"),
c);
return -1;
}
continue;
}
if (virXMLNodeNameEqual(node, "read_bytes_sec")) {
if (virStrToLong_ull(c, NULL, 10, &dev->rbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse read bytes sec %s"),
c);
return -1;
}
continue;
}
if (virXMLNodeNameEqual(node, "write_bytes_sec")) {
if (virStrToLong_ull(c, NULL, 10, &dev->wbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse write bytes sec %s"),
c);
return -1;
}
continue;
}
if (virXMLNodeNameEqual(node, "read_iops_sec")) {
if (virStrToLong_ui(c, NULL, 10, &dev->riops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse read iops sec %s"),
c);
return -1;
}
continue;
}
if (virXMLNodeNameEqual(node, "write_iops_sec")) {
if (virStrToLong_ui(c, NULL, 10, &dev->wiops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse write iops sec %s"),
c);
return -1;
}
continue;
}
}
if (!path) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("missing per-device path")); _("missing per-device path"));
return -1; return -1;
} }
if ((weight = virXPathString("string(./weight)", ctxt)) &&
(virStrToLong_ui(weight, NULL, 10, &dev->weight) < 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse weight %s"), weight);
return -1;
}
if ((read_bytes_sec = virXPathString("string(./read_bytes_sec)", ctxt)) &&
(virStrToLong_ull(read_bytes_sec, NULL, 10, &dev->rbps) < 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse read bytes sec %s"),
read_bytes_sec);
return -1;
}
if ((write_bytes_sec = virXPathString("string(./write_bytes_sec)", ctxt)) &&
(virStrToLong_ull(write_bytes_sec, NULL, 10, &dev->wbps) < 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse write bytes sec %s"),
write_bytes_sec);
return -1;
}
if ((read_iops_sec = virXPathString("string(./read_iops_sec)", ctxt)) &&
(virStrToLong_ui(read_iops_sec, NULL, 10, &dev->riops) < 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse read iops sec %s"),
read_iops_sec);
return -1;
}
if ((write_iops_sec = virXPathString("string(./write_iops_sec)", ctxt)) &&
(virStrToLong_ui(write_iops_sec, NULL, 10, &dev->wiops) < 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("could not parse write iops sec %s"),
write_iops_sec);
return -1;
}
dev->path = g_steal_pointer(&path); dev->path = g_steal_pointer(&path);
return 0; return 0;
} }